From 9865fcd9295d4a10a2bfa23c25010acb77ee30a1 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 17 Apr 2018 09:59:21 +0200 Subject: [PATCH] 3D viewer: fix hotkeys in 3D preview panel, and incorrect icons in context menu. --- 3d-viewer/3d_cache/dialogs/panel_prev_model.h | 10 +- 3d-viewer/3d_canvas/eda_3d_canvas.cpp | 30 ++-- bitmaps_png/cpp_26/axis3d_back.cpp | 169 +++++++++--------- bitmaps_png/cpp_26/axis3d_front.cpp | 169 +++++++++--------- bitmaps_png/sources/axis3d_back.svg | 21 ++- bitmaps_png/sources/axis3d_front.svg | 21 +-- 6 files changed, 210 insertions(+), 210 deletions(-) diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_model.h b/3d-viewer/3d_cache/dialogs/panel_prev_model.h index 85cbb8ed64..afe8825147 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_model.h +++ b/3d-viewer/3d_cache/dialogs/panel_prev_model.h @@ -153,7 +153,7 @@ private: void View3DLeft( wxCommandEvent& event ) override { - m_previewPane->SetView3D( 'X' ); + m_previewPane->SetView3D( GR_KB_SHIFT + 'X' ); } void View3DFront( wxCommandEvent& event ) override @@ -163,7 +163,7 @@ private: void View3DTop( wxCommandEvent& event ) override { - m_previewPane->SetView3D( 'z' ); + m_previewPane->SetView3D( 'Z' ); } void View3DUpdate( wxCommandEvent& event ) override @@ -174,17 +174,17 @@ private: void View3DRight( wxCommandEvent& event ) override { - m_previewPane->SetView3D( 'x' ); + m_previewPane->SetView3D( 'X' ); } void View3DBack( wxCommandEvent& event ) override { - m_previewPane->SetView3D( 'y' ); + m_previewPane->SetView3D( GR_KB_SHIFT + 'Y' ); } void View3DBottom( wxCommandEvent& event ) override { - m_previewPane->SetView3D( 'Z' ); + m_previewPane->SetView3D( GR_KB_SHIFT + 'Z' ); } public: diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp index 9f93a4f6ee..c077a6df76 100644 --- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp +++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp @@ -701,27 +701,27 @@ void EDA_3D_CANVAS::OnPopUpMenu( wxCommandEvent &event ) break; case ID_POPUP_VIEW_XPOS: - key = GR_KB_SHIFT + 'X'; - break; - - case ID_POPUP_VIEW_XNEG: key = 'X'; break; - case ID_POPUP_VIEW_YPOS: - key = GR_KB_SHIFT + 'Y'; + case ID_POPUP_VIEW_XNEG: + key = GR_KB_SHIFT + 'X'; break; - case ID_POPUP_VIEW_YNEG: + case ID_POPUP_VIEW_YPOS: key = 'Y'; break; + case ID_POPUP_VIEW_YNEG: + key = GR_KB_SHIFT + 'Y'; + break; + case ID_POPUP_VIEW_ZPOS: - key = GR_KB_SHIFT + 'Z'; + key = 'Z'; break; case ID_POPUP_VIEW_ZNEG: - key = 'Z'; + key = GR_KB_SHIFT + 'Z'; break; case ID_POPUP_MOVE3D_LEFT: @@ -1005,7 +1005,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode ) request_start_moving_camera( glm::min( glm::max( m_settings.CameraGet().ZoomGet(), 0.5f ), 1.125f ) ); return true; - case GR_KB_SHIFT + 'X': + case 'X': m_settings.CameraGet().SetInterpolateMode( INTERPOLATION_BEZIER ); m_settings.CameraGet().SetT0_and_T1_current_T(); m_settings.CameraGet().Reset_T1(); @@ -1014,7 +1014,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode ) request_start_moving_camera(); return true; - case 'X': + case GR_KB_SHIFT + 'X': m_settings.CameraGet().SetInterpolateMode( INTERPOLATION_BEZIER ); m_settings.CameraGet().SetT0_and_T1_current_T(); m_settings.CameraGet().Reset_T1(); @@ -1023,7 +1023,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode ) request_start_moving_camera(); return true; - case GR_KB_SHIFT + 'Y': + case 'Y': m_settings.CameraGet().SetInterpolateMode( INTERPOLATION_BEZIER ); m_settings.CameraGet().SetT0_and_T1_current_T(); m_settings.CameraGet().Reset_T1(); @@ -1031,7 +1031,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode ) request_start_moving_camera(); return true; - case 'Y': + case GR_KB_SHIFT + 'Y': m_settings.CameraGet().SetInterpolateMode( INTERPOLATION_BEZIER ); m_settings.CameraGet().SetT0_and_T1_current_T(); m_settings.CameraGet().Reset_T1(); @@ -1040,7 +1040,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode ) request_start_moving_camera(); return true; - case GR_KB_SHIFT + 'Z': + case 'Z': m_settings.CameraGet().SetInterpolateMode( INTERPOLATION_BEZIER ); m_settings.CameraGet().SetT0_and_T1_current_T(); m_settings.CameraGet().Reset_T1(); @@ -1048,7 +1048,7 @@ bool EDA_3D_CANVAS::SetView3D( int aKeycode ) glm::min( glm::max( m_settings.CameraGet().ZoomGet(), 0.5f ), 1.125f ) ); return true; - case 'Z': + case GR_KB_SHIFT + 'Z': m_settings.CameraGet().SetInterpolateMode( INTERPOLATION_BEZIER ); m_settings.CameraGet().SetT0_and_T1_current_T(); m_settings.CameraGet().Reset_T1(); diff --git a/bitmaps_png/cpp_26/axis3d_back.cpp b/bitmaps_png/cpp_26/axis3d_back.cpp index 4e15e1fc97..d996ee57b8 100644 --- a/bitmaps_png/cpp_26/axis3d_back.cpp +++ b/bitmaps_png/cpp_26/axis3d_back.cpp @@ -8,91 +8,90 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x05, 0x33, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0xd6, 0x79, 0x4c, 0x93, - 0x67, 0x1c, 0x07, 0xf0, 0x87, 0x8a, 0x47, 0xbd, 0xa6, 0x80, 0x32, 0x20, 0x9b, 0xd3, 0x2c, 0xf3, - 0x0f, 0x37, 0xdd, 0x8c, 0x59, 0xe2, 0xa6, 0x8b, 0xc6, 0x73, 0x32, 0xe4, 0xb2, 0xf4, 0x82, 0xb6, - 0x54, 0xe9, 0x05, 0x0c, 0x14, 0x07, 0x2a, 0xa0, 0x4e, 0x86, 0x58, 0x70, 0x43, 0x64, 0x72, 0x08, - 0x11, 0x10, 0x25, 0xa0, 0x53, 0x4e, 0x07, 0x28, 0x08, 0x55, 0x04, 0x15, 0x1c, 0x1e, 0xc1, 0x33, - 0xe2, 0x7d, 0x15, 0x2b, 0x16, 0x15, 0x95, 0xb6, 0xef, 0x77, 0x6f, 0xbb, 0xd0, 0x50, 0x0e, 0xe9, - 0x96, 0xf9, 0x24, 0x4f, 0xde, 0xb4, 0xe9, 0xf3, 0x7c, 0xde, 0xe7, 0xf7, 0x7b, 0xfa, 0x7b, 0x1e, - 0x42, 0xac, 0x6d, 0xcb, 0x04, 0x9f, 0x11, 0x57, 0x1e, 0x87, 0xb8, 0xf9, 0xce, 0x24, 0x2c, 0xd6, - 0x68, 0xf2, 0x3e, 0xda, 0x68, 0xd6, 0x2a, 0xb9, 0x3d, 0x4f, 0xd2, 0x31, 0x37, 0x22, 0xa6, 0x6b, - 0x41, 0xe4, 0xd6, 0x76, 0x67, 0x41, 0x90, 0x76, 0x3c, 0x47, 0xa2, 0x71, 0x11, 0x06, 0x5d, 0x9c, - 0x24, 0x0e, 0x3d, 0xc8, 0xf4, 0x12, 0x87, 0xd1, 0x2f, 0xb1, 0x84, 0xb8, 0xf9, 0x4d, 0x26, 0x9b, - 0x37, 0x33, 0xfe, 0xbd, 0xe0, 0x21, 0x1a, 0xe7, 0xc0, 0x95, 0x96, 0x2f, 0x8a, 0x8a, 0xd3, 0xde, - 0x78, 0xf8, 0x18, 0x2d, 0x77, 0xef, 0xa3, 0xbb, 0xe9, 0xf4, 0x7a, 0x5c, 0x7f, 0xf0, 0x08, 0x25, - 0x67, 0xce, 0x21, 0xfe, 0x50, 0xa9, 0x9e, 0xbf, 0x7d, 0x57, 0xfb, 0x8c, 0xe0, 0x0d, 0x6d, 0xf4, - 0x0b, 0x68, 0xed, 0x79, 0xd2, 0x7b, 0x4e, 0x7e, 0x81, 0x35, 0xf6, 0x3c, 0x79, 0xd4, 0xe0, 0xc8, - 0x0f, 0xdc, 0xd9, 0xf4, 0xa0, 0x87, 0x3b, 0x8a, 0x2b, 0xde, 0x52, 0x14, 0x85, 0x9a, 0x8b, 0x97, - 0x21, 0x4a, 0x4c, 0x87, 0x35, 0xad, 0xfd, 0xe5, 0x2b, 0x2c, 0x88, 0x8c, 0xd3, 0x8f, 0xf0, 0xf2, - 0xd7, 0xbd, 0x8b, 0xb0, 0x19, 0xcf, 0x91, 0x46, 0x4c, 0x12, 0x87, 0xb4, 0x37, 0xdf, 0xbc, 0x6d, - 0x1e, 0x7c, 0xeb, 0x89, 0x1a, 0x85, 0x0d, 0x4d, 0x56, 0x41, 0xe1, 0xd9, 0xf9, 0x7a, 0x3a, 0xac, - 0x86, 0x31, 0xac, 0x95, 0x2f, 0xfb, 0x27, 0x96, 0x73, 0x1d, 0xed, 0x79, 0xb2, 0x86, 0x15, 0x71, - 0x49, 0x1d, 0x2f, 0x5f, 0xbf, 0xb1, 0x18, 0x6c, 0x84, 0xd2, 0xcb, 0xab, 0x07, 0x45, 0x92, 0x4a, - 0x2b, 0x29, 0x47, 0x5f, 0x85, 0xa1, 0xf5, 0xb1, 0x1a, 0xe3, 0xd8, 0x92, 0x67, 0x7d, 0x0c, 0x5b, - 0x0f, 0xe1, 0x62, 0x7b, 0xae, 0x44, 0xbd, 0xbf, 0xf6, 0x94, 0xbe, 0xbf, 0x09, 0xfe, 0xba, 0x79, - 0x0b, 0x9e, 0xb1, 0x89, 0xef, 0x44, 0x72, 0x6b, 0xea, 0xa8, 0x09, 0x7c, 0xb9, 0xa1, 0x3b, 0x97, - 0x1f, 0xf8, 0x04, 0x68, 0x2c, 0x77, 0x15, 0x5b, 0x7a, 0x88, 0xe9, 0x23, 0xc1, 0xf7, 0x9b, 0x12, - 0x90, 0x53, 0x7d, 0x02, 0x9a, 0x8e, 0x17, 0x7d, 0x26, 0x79, 0xab, 0xd3, 0xe1, 0xd1, 0xb3, 0xe7, - 0x03, 0x22, 0xc6, 0x4d, 0x61, 0xc7, 0x93, 0x1a, 0x1a, 0xaf, 0xb7, 0x9a, 0x3e, 0x77, 0xe9, 0xf4, - 0xa0, 0x73, 0xac, 0xb6, 0x80, 0x46, 0xb2, 0x65, 0x0d, 0x0b, 0x53, 0x8a, 0xb0, 0x38, 0xa5, 0x88, - 0x9a, 0x16, 0xf1, 0xab, 0x7e, 0x2c, 0x3f, 0x90, 0x1a, 0xc9, 0x96, 0x1a, 0x26, 0x4b, 0x7e, 0xea, - 0x62, 0x29, 0x93, 0x91, 0x79, 0xb4, 0x16, 0x75, 0x97, 0xaf, 0x61, 0xe9, 0x26, 0x65, 0xbf, 0xc8, - 0xc9, 0x96, 0xab, 0xb0, 0xe3, 0x4a, 0x0c, 0xaa, 0x4b, 0x57, 0xa8, 0xee, 0xef, 0x3a, 0x3a, 0x5f, - 0xc3, 0x9e, 0x2b, 0xbd, 0x6f, 0x09, 0x71, 0xe4, 0xe5, 0x5e, 0x05, 0x75, 0x08, 0x3b, 0xa3, 0x46, - 0x78, 0xe3, 0x53, 0xac, 0x39, 0xfd, 0x04, 0x32, 0xd5, 0x1d, 0xb8, 0x1f, 0xac, 0xc7, 0xac, 0x1d, - 0xf9, 0x94, 0xcb, 0x9a, 0xad, 0x3a, 0x26, 0x47, 0x4e, 0x31, 0x96, 0x0b, 0xe0, 0x20, 0x08, 0xd6, - 0x2f, 0x8a, 0x8e, 0xa7, 0xb6, 0xfd, 0x51, 0x82, 0xbb, 0xea, 0x36, 0x5c, 0xb8, 0x7d, 0x07, 0x74, - 0x5e, 0x0d, 0x47, 0x1a, 0x9b, 0xa9, 0x9e, 0x78, 0x9b, 0xb6, 0x03, 0x13, 0xf9, 0xf2, 0x56, 0x0b, - 0x88, 0xc9, 0x96, 0xe6, 0x2f, 0xda, 0x53, 0x01, 0xc9, 0x89, 0x3b, 0x90, 0x9d, 0xbc, 0x0b, 0x09, - 0x8d, 0x88, 0x8e, 0xdf, 0x04, 0xbb, 0xf2, 0x0a, 0xdc, 0xca, 0x2e, 0x60, 0xc1, 0xe1, 0xb3, 0xf8, - 0x7a, 0x5f, 0x0d, 0x26, 0x29, 0xb3, 0xe0, 0x1c, 0x9f, 0x8d, 0xd1, 0xe1, 0x09, 0x94, 0xad, 0x38, - 0x4c, 0x6f, 0xe3, 0xbd, 0x92, 0x62, 0x78, 0x0a, 0x91, 0x5c, 0x5a, 0x69, 0xe8, 0xbd, 0xca, 0x7b, - 0x6d, 0x1a, 0x38, 0xf2, 0x15, 0x57, 0x2c, 0xa0, 0xe1, 0x2b, 0x02, 0x76, 0xcf, 0xde, 0x75, 0x18, - 0x9c, 0xa3, 0x57, 0xc1, 0x3b, 0x76, 0xcd, 0xf4, 0xf4, 0x2e, 0x6f, 0xa1, 0x91, 0xf3, 0x58, 0x58, - 0xd8, 0x88, 0x6f, 0x0f, 0x9c, 0xc2, 0xe7, 0x19, 0x65, 0x60, 0x0a, 0x43, 0xe1, 0x92, 0x56, 0x84, - 0x71, 0x3b, 0x0b, 0x30, 0x74, 0x7b, 0x0e, 0x88, 0x72, 0x0f, 0x6c, 0x04, 0x21, 0x86, 0xf2, 0xa6, - 0x0b, 0x7d, 0xc2, 0x69, 0xfc, 0x83, 0x3b, 0x09, 0x02, 0x9b, 0x2d, 0x77, 0x9c, 0xa7, 0x38, 0xfe, - 0x8b, 0x84, 0x5c, 0x2c, 0x2b, 0x69, 0x86, 0x6b, 0xe9, 0x79, 0xd3, 0x73, 0x71, 0x51, 0x13, 0xe6, - 0x1f, 0x3a, 0x83, 0x6f, 0xe8, 0x90, 0xce, 0xa4, 0x57, 0x33, 0x35, 0xf3, 0x08, 0x26, 0x6c, 0x49, - 0x85, 0xc3, 0xef, 0x07, 0x31, 0xf2, 0xb7, 0x7d, 0x26, 0xa4, 0x1b, 0x2a, 0x3b, 0xdb, 0xdc, 0x07, - 0xba, 0x74, 0xfb, 0x1e, 0xe8, 0x52, 0xd5, 0x60, 0x01, 0x31, 0x96, 0x0b, 0xd7, 0x4f, 0x8e, 0x49, - 0xc7, 0x9c, 0x03, 0xf5, 0x98, 0x4b, 0xe7, 0x65, 0x0e, 0xbd, 0x82, 0xd9, 0x05, 0x27, 0x31, 0x2b, - 0xaf, 0x16, 0xd3, 0x73, 0xab, 0x30, 0x35, 0xab, 0x02, 0x8e, 0x5b, 0x33, 0x30, 0x4c, 0xb4, 0x1a, - 0x23, 0xd6, 0x25, 0x80, 0x11, 0x93, 0x06, 0xf2, 0x4b, 0x5a, 0x37, 0xa4, 0x2f, 0x3e, 0x7d, 0xae, - 0x0f, 0xd4, 0x74, 0xa3, 0x15, 0x2e, 0x82, 0xa0, 0xda, 0x5e, 0xe5, 0x86, 0x1f, 0xe8, 0xb8, 0x21, - 0x51, 0x6f, 0x9c, 0x74, 0x46, 0x6e, 0x35, 0xa6, 0xef, 0xad, 0xc2, 0xb4, 0x9c, 0xa3, 0x26, 0x60, - 0x4a, 0x66, 0x19, 0x9c, 0x12, 0xf3, 0x30, 0x6a, 0x4d, 0x2c, 0x46, 0x44, 0x25, 0x82, 0x11, 0xbd, - 0x03, 0x64, 0x6d, 0x1c, 0x08, 0x5b, 0x06, 0x12, 0x95, 0x04, 0xe2, 0x25, 0xa6, 0x56, 0xed, 0xcc, - 0x80, 0xf6, 0x55, 0x27, 0x9e, 0x3c, 0xd7, 0x9a, 0x21, 0xe3, 0x2e, 0x75, 0x16, 0x06, 0x97, 0x5b, - 0x42, 0xae, 0x7c, 0xe1, 0xd8, 0xd5, 0xb1, 0xaf, 0x3f, 0xc9, 0x28, 0x45, 0x77, 0xff, 0x38, 0xbd, - 0x18, 0xce, 0xa9, 0x85, 0x60, 0x06, 0x6e, 0xc4, 0xd0, 0x55, 0xe1, 0x60, 0xd2, 0xe1, 0xb2, 0x89, - 0xcf, 0x32, 0x87, 0xcc, 0x1c, 0x3a, 0xbe, 0x42, 0xbf, 0x2e, 0x3b, 0xdf, 0xb4, 0xc5, 0xbf, 0xfc, - 0x71, 0x03, 0xf2, 0x54, 0xf5, 0x88, 0x2d, 0x28, 0x86, 0x7f, 0xd2, 0x6e, 0x38, 0xf9, 0x29, 0x0a, - 0x2d, 0x21, 0x37, 0x5f, 0xef, 0x61, 0x8a, 0xa8, 0x0e, 0xbb, 0xe4, 0x03, 0x30, 0xf6, 0xf1, 0xc9, - 0x05, 0x18, 0x9b, 0x90, 0x83, 0xe1, 0xe1, 0x4a, 0x0c, 0xdb, 0xb2, 0x0b, 0x43, 0x12, 0xb2, 0xfb, - 0x00, 0x3d, 0x72, 0xa4, 0xcb, 0x57, 0x35, 0x58, 0x84, 0xcd, 0x58, 0x23, 0x67, 0x04, 0xaf, 0xef, - 0x1c, 0xe3, 0x23, 0x0e, 0xe8, 0x75, 0xa8, 0xf9, 0x2e, 0xb5, 0x11, 0x87, 0xb5, 0x1b, 0x27, 0xb4, - 0xa5, 0x01, 0xe3, 0x93, 0x9e, 0xe0, 0x9f, 0x10, 0x0d, 0x00, 0xf4, 0x84, 0xf6, 0xd7, 0xd6, 0x5b, - 0x40, 0x79, 0x74, 0x19, 0xb3, 0xe3, 0x48, 0x4e, 0x1b, 0x0b, 0x74, 0xaf, 0x15, 0x71, 0xe7, 0x10, - 0x61, 0xc8, 0x53, 0xd3, 0xe0, 0xb0, 0x58, 0x90, 0x80, 0xf0, 0x41, 0x01, 0x33, 0xe4, 0x17, 0xa2, - 0xdb, 0x5b, 0x5d, 0x67, 0x46, 0xd4, 0x74, 0x9e, 0x1c, 0x78, 0x32, 0x0d, 0x71, 0xe7, 0x7c, 0xd4, - 0x4f, 0xd5, 0xe6, 0x7c, 0x45, 0xf8, 0x8a, 0x36, 0xf2, 0x73, 0x0a, 0x88, 0x22, 0x9a, 0xde, 0x51, - 0xe9, 0xd6, 0x43, 0x82, 0x90, 0xae, 0xac, 0x2a, 0x95, 0x19, 0x5a, 0xb2, 0x51, 0xf9, 0x7c, 0xd4, - 0x0a, 0x7f, 0xff, 0x01, 0x8e, 0x07, 0xdf, 0x4f, 0x89, 0xa7, 0xa8, 0x93, 0xc8, 0x22, 0xad, 0x06, - 0x7a, 0x42, 0x99, 0x95, 0xb5, 0x26, 0x24, 0xeb, 0x98, 0x4a, 0x3f, 0x81, 0x2f, 0x53, 0x0d, 0x7c, - 0xd4, 0xcd, 0x9b, 0x67, 0x4b, 0xdc, 0x45, 0xa9, 0xf4, 0xd1, 0xfd, 0x98, 0xb0, 0xa5, 0x1a, 0x12, - 0xb4, 0xb1, 0x8b, 0x6c, 0x4e, 0xb6, 0x1a, 0xda, 0x5d, 0x71, 0x1c, 0x0f, 0x34, 0xcf, 0x8c, 0x35, - 0xef, 0x29, 0x59, 0x26, 0xfa, 0xd0, 0xba, 0x7b, 0x82, 0x2b, 0x6f, 0x0a, 0x71, 0x17, 0xae, 0x25, - 0x5e, 0xfe, 0xe7, 0x88, 0x97, 0xa8, 0x9d, 0xac, 0x5c, 0xfb, 0x82, 0x44, 0x28, 0x41, 0xb6, 0x65, - 0x0e, 0x08, 0xa5, 0xfe, 0x59, 0x85, 0xef, 0xd6, 0xc5, 0x68, 0x99, 0xde, 0xfe, 0xdc, 0xff, 0x76, - 0xfd, 0x59, 0xc2, 0xb2, 0xa3, 0x61, 0x16, 0xf1, 0xf0, 0x2f, 0x21, 0xee, 0x02, 0x2d, 0xe1, 0x05, - 0x69, 0x48, 0x68, 0x0c, 0x45, 0x62, 0xd2, 0x7a, 0x40, 0xa1, 0x6f, 0x17, 0x46, 0xc6, 0x19, 0xe8, - 0x03, 0xaf, 0xfc, 0xff, 0xb9, 0x73, 0x19, 0xc3, 0xeb, 0xca, 0x9b, 0x4f, 0x3c, 0x84, 0x29, 0x74, - 0x7f, 0x48, 0x7c, 0x24, 0x6d, 0x24, 0x30, 0xfa, 0x8d, 0x0d, 0x57, 0xde, 0x35, 0xdc, 0x98, 0x5f, - 0x4f, 0xbf, 0x89, 0xef, 0xe5, 0xae, 0x67, 0xba, 0x50, 0xba, 0x09, 0x22, 0x18, 0x9e, 0xe2, 0x96, - 0x21, 0xee, 0x02, 0xde, 0x60, 0x3f, 0xff, 0x1b, 0x73, 0x06, 0xe5, 0x5c, 0xf9, 0x44, 0x86, 0x22, - 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x05, 0x22, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x7b, 0x4c, 0x53, + 0x57, 0x1c, 0xc7, 0x0f, 0x2f, 0x85, 0xa1, 0x43, 0x51, 0xc4, 0x69, 0x9c, 0xd3, 0xa1, 0x43, 0xf7, + 0xd2, 0x2c, 0x33, 0x73, 0x33, 0x4e, 0xb7, 0x3f, 0x30, 0x30, 0xa8, 0x1d, 0x14, 0xfa, 0x6e, 0xa1, + 0x50, 0x4a, 0x0b, 0x8a, 0x80, 0x82, 0x65, 0xa8, 0x20, 0x38, 0x50, 0xd1, 0xa9, 0x81, 0x15, 0x54, + 0x64, 0xb0, 0xcc, 0x17, 0x1a, 0x11, 0x4d, 0x71, 0xc8, 0x1c, 0xc3, 0x17, 0x28, 0x4e, 0x97, 0x88, + 0xe0, 0x0b, 0xc7, 0x94, 0x39, 0x79, 0x6b, 0x7d, 0xd0, 0xc2, 0xfd, 0xee, 0xdc, 0x3a, 0x9d, 0xa5, + 0x80, 0xb8, 0xb8, 0x6f, 0x72, 0x92, 0x7b, 0x4f, 0x4e, 0xce, 0x27, 0xbf, 0xc7, 0xf9, 0x9e, 0x43, + 0xc8, 0x20, 0x65, 0xcf, 0x11, 0x7a, 0xd9, 0x71, 0xc4, 0x3b, 0x89, 0xb7, 0x20, 0x81, 0xf8, 0xc9, + 0xe6, 0x12, 0x1e, 0x6f, 0x08, 0x79, 0xa9, 0xfa, 0x40, 0xe9, 0xe0, 0xca, 0x57, 0x6e, 0x1a, 0x2f, + 0x8d, 0x32, 0xb8, 0x85, 0xc4, 0x62, 0x4a, 0x6c, 0x3a, 0xe3, 0x2a, 0x8b, 0x66, 0x86, 0x06, 0x28, + 0x98, 0xa1, 0x81, 0x61, 0x3d, 0xce, 0x82, 0x70, 0xc3, 0x70, 0xbe, 0xea, 0xaa, 0x8d, 0xaf, 0xb8, + 0x88, 0xf8, 0x08, 0xb5, 0xc4, 0x4f, 0x38, 0x9f, 0xcc, 0x93, 0x3b, 0xbe, 0x18, 0xc4, 0x57, 0x32, + 0x89, 0x42, 0x6a, 0x35, 0xd9, 0xf9, 0x06, 0xfd, 0xd9, 0xf3, 0x98, 0x9d, 0x9c, 0x8d, 0xf8, 0x33, + 0x2d, 0x88, 0x3a, 0xd9, 0x84, 0x90, 0x63, 0xd7, 0xc1, 0x2d, 0x3e, 0x87, 0x8f, 0xb7, 0xeb, 0xe1, + 0xb9, 0xae, 0x00, 0xe3, 0xb5, 0x1b, 0xe1, 0x1a, 0x91, 0xc8, 0x38, 0x8a, 0x34, 0x8c, 0x2d, 0x57, + 0xce, 0xd8, 0x70, 0xe5, 0x3d, 0xf6, 0x01, 0x8a, 0x0e, 0x1a, 0xb9, 0xdd, 0x80, 0x0c, 0x47, 0xae, + 0x4c, 0x34, 0x4a, 0x10, 0xde, 0x7a, 0xf8, 0xcc, 0xaf, 0x0c, 0xa8, 0x2a, 0x2f, 0xd6, 0x61, 0xf6, + 0xaa, 0x2d, 0xd0, 0xd6, 0xb4, 0x61, 0x11, 0x05, 0x05, 0x53, 0x50, 0x40, 0xe9, 0x45, 0x2c, 0x28, + 0xae, 0xc1, 0x27, 0x7b, 0x4e, 0xe0, 0xbd, 0xc2, 0xa3, 0x98, 0xbc, 0xed, 0x10, 0xdc, 0xb2, 0x8a, + 0xe0, 0x98, 0x59, 0x00, 0x22, 0x5d, 0x0c, 0xe2, 0x27, 0x01, 0x9b, 0x91, 0xbe, 0x09, 0x3c, 0x9e, + 0x93, 0x9b, 0x30, 0x22, 0x6f, 0x56, 0x4c, 0x52, 0xc7, 0xad, 0xd6, 0x36, 0x3c, 0x51, 0x55, 0xfd, + 0x55, 0xcc, 0xd4, 0x66, 0x9a, 0x21, 0xa1, 0x15, 0x37, 0x20, 0x28, 0xab, 0x87, 0xdf, 0xa1, 0x0b, + 0xf8, 0x6c, 0x5f, 0x15, 0x3e, 0xdc, 0x59, 0x81, 0x69, 0xf9, 0x47, 0x30, 0x21, 0xa7, 0x18, 0x23, + 0x36, 0xef, 0x86, 0x6d, 0x78, 0x02, 0x48, 0xe8, 0x32, 0xd8, 0x2c, 0x94, 0x33, 0xfd, 0xa4, 0x4a, + 0xf0, 0xb6, 0xab, 0x20, 0xbc, 0x21, 0xb1, 0x60, 0xcf, 0xc3, 0x1e, 0x86, 0xc1, 0xb3, 0xba, 0xd0, + 0xf0, 0x3b, 0xa6, 0xc7, 0xa5, 0x41, 0x5a, 0x7e, 0x05, 0x81, 0x47, 0x2e, 0xc1, 0x97, 0x42, 0x3e, + 0xdf, 0x5f, 0x8d, 0x8f, 0x76, 0x55, 0xe2, 0xdd, 0x82, 0x32, 0x4c, 0xda, 0xfa, 0x38, 0x1a, 0x87, + 0xa8, 0x64, 0x1a, 0x4d, 0x34, 0x48, 0xfa, 0x76, 0x0a, 0x92, 0x59, 0x81, 0x6c, 0x86, 0xf9, 0x87, + 0x68, 0x5e, 0x93, 0x68, 0xda, 0x8e, 0xd7, 0xd6, 0xa3, 0x2f, 0xd5, 0xdd, 0x6c, 0x82, 0x47, 0xf4, + 0x2a, 0x0a, 0x38, 0x0f, 0xaf, 0x03, 0x67, 0xf1, 0x69, 0xd1, 0x29, 0xcc, 0xda, 0xf9, 0x0b, 0xde, + 0xa1, 0x10, 0x36, 0x65, 0xee, 0xd9, 0xfb, 0xe0, 0x18, 0xbf, 0x0e, 0x44, 0xa0, 0x06, 0xf9, 0x7a, + 0x1b, 0x48, 0x46, 0x9e, 0x35, 0x88, 0x46, 0x51, 0x6a, 0xc7, 0x91, 0x20, 0x6d, 0x77, 0x31, 0x73, + 0xba, 0xee, 0x2a, 0x1e, 0x76, 0x19, 0xad, 0x40, 0x37, 0xfe, 0x6a, 0xc6, 0xeb, 0xea, 0x44, 0x73, + 0x3d, 0x58, 0xc0, 0x8c, 0xc2, 0x72, 0x78, 0xee, 0x28, 0xc5, 0xc4, 0xdc, 0x83, 0x8f, 0xeb, 0x92, + 0xb8, 0x11, 0x24, 0x48, 0x05, 0x92, 0x9a, 0x63, 0x86, 0x98, 0x23, 0xe2, 0xf4, 0x02, 0x8d, 0x95, + 0x68, 0x4e, 0x46, 0xe7, 0x16, 0xc2, 0x37, 0x25, 0x93, 0xf1, 0x50, 0xc6, 0x98, 0x46, 0xf0, 0x95, + 0xcc, 0x1b, 0x8a, 0xe8, 0x9e, 0xc0, 0xf4, 0xcd, 0xa6, 0xec, 0xc3, 0x47, 0x99, 0x33, 0x97, 0xaf, + 0xa3, 0xf1, 0x4e, 0x0b, 0xc6, 0x29, 0x97, 0x62, 0x7a, 0xfe, 0x8f, 0x98, 0x92, 0xa7, 0xa7, 0x80, + 0x12, 0x8c, 0xfd, 0x76, 0xbf, 0xb9, 0x26, 0x43, 0x56, 0x66, 0x81, 0xf0, 0xc2, 0x40, 0x68, 0x57, + 0x9a, 0x21, 0xec, 0xa0, 0x51, 0xd9, 0x72, 0x83, 0x7b, 0x2c, 0x40, 0xe3, 0x64, 0x51, 0xfa, 0xde, + 0x29, 0xbb, 0xd3, 0x71, 0x17, 0x05, 0x3f, 0x55, 0x42, 0x92, 0xa9, 0x63, 0x66, 0x44, 0x69, 0x8d, + 0x63, 0xc4, 0xea, 0x1e, 0x5b, 0x8e, 0x14, 0xce, 0x91, 0x2b, 0x30, 0x6c, 0x79, 0x26, 0x86, 0xa5, + 0xe6, 0xc2, 0x69, 0x7d, 0x21, 0x6c, 0x92, 0xff, 0x81, 0x24, 0x6d, 0xfa, 0x17, 0xc2, 0x8e, 0xb4, + 0x5c, 0xd8, 0x7e, 0x29, 0xef, 0xee, 0x15, 0x91, 0x7a, 0x57, 0x69, 0xcd, 0x05, 0x0c, 0xa4, 0x07, + 0x5d, 0x5d, 0x18, 0x2e, 0x8a, 0x80, 0x43, 0xc2, 0x7a, 0xd8, 0x68, 0xbe, 0xa2, 0x05, 0x5f, 0x04, + 0xe2, 0x1f, 0x0a, 0x22, 0xd2, 0x80, 0xd0, 0x6e, 0xb4, 0x80, 0xb0, 0x23, 0x55, 0x07, 0x3b, 0xff, + 0x10, 0xa3, 0x05, 0x68, 0x8c, 0x48, 0x95, 0x5b, 0x74, 0xa2, 0x7a, 0x40, 0x10, 0xdb, 0x85, 0x2e, + 0x22, 0xb5, 0xf5, 0x86, 0x3c, 0xe5, 0xd3, 0xe2, 0x5b, 0x8c, 0x94, 0x6c, 0x0a, 0x52, 0x3c, 0xb2, + 0x00, 0x8d, 0x0c, 0x52, 0xae, 0xfd, 0xae, 0xbc, 0x12, 0xcf, 0x93, 0x8b, 0x30, 0xc2, 0x7a, 0xc3, + 0xa0, 0x70, 0x90, 0x35, 0x5b, 0xad, 0xe7, 0x69, 0x4a, 0xa9, 0x33, 0xdc, 0xb7, 0x00, 0x0d, 0x59, + 0x28, 0x5b, 0x9e, 0x75, 0xb8, 0x6c, 0x40, 0x88, 0x4e, 0x5f, 0x8e, 0x89, 0x8a, 0x25, 0x70, 0x11, + 0xab, 0xa9, 0xd5, 0x2c, 0x87, 0xdd, 0xe2, 0x14, 0x90, 0x27, 0x9d, 0x96, 0x96, 0x63, 0x0d, 0x5a, + 0xb9, 0x99, 0x05, 0xdd, 0xb5, 0x3c, 0x45, 0x5f, 0x88, 0x34, 0x19, 0x45, 0x25, 0xdd, 0xfd, 0xa5, + 0xec, 0x76, 0x7b, 0x07, 0x54, 0x59, 0x79, 0x68, 0x37, 0xdc, 0x87, 0xd1, 0xd4, 0x8d, 0xb3, 0x57, + 0xae, 0x23, 0xf3, 0x80, 0x1e, 0xde, 0xa9, 0xdf, 0xc0, 0x86, 0xda, 0xcc, 0x70, 0x1a, 0xe9, 0xc8, + 0xc8, 0x24, 0x90, 0x98, 0x35, 0x66, 0x00, 0xdb, 0xda, 0x6c, 0x73, 0xd8, 0xf3, 0x42, 0xdb, 0x2c, + 0x41, 0x3e, 0x22, 0x19, 0xeb, 0x06, 0xbd, 0x21, 0x8f, 0x8c, 0x46, 0x70, 0x56, 0x6f, 0xc0, 0xda, + 0x7d, 0x87, 0xfa, 0x8d, 0x74, 0x92, 0x22, 0xba, 0xfb, 0x78, 0x6d, 0x1d, 0xf6, 0x1e, 0xaf, 0x82, + 0x4a, 0x97, 0x0f, 0xcf, 0x48, 0x2d, 0x5e, 0xa5, 0xe0, 0x57, 0x24, 0x91, 0x70, 0xe0, 0x29, 0x6e, + 0xf7, 0xb2, 0x1e, 0xb1, 0xbf, 0x46, 0x97, 0x7f, 0xf7, 0xd9, 0x0d, 0x58, 0x9f, 0x63, 0xfd, 0xad, + 0xa4, 0xfa, 0xdc, 0x80, 0x29, 0x7d, 0x33, 0x74, 0x89, 0xa9, 0xfe, 0xe6, 0x9f, 0x16, 0x73, 0x6c, + 0xd4, 0x73, 0x96, 0xa6, 0x18, 0x9c, 0xb8, 0x8a, 0x78, 0x4b, 0x90, 0xb7, 0x78, 0x81, 0x24, 0x33, + 0xbb, 0xfd, 0xc9, 0x42, 0xd6, 0x19, 0xa6, 0x47, 0x2c, 0x43, 0xf1, 0xe9, 0x9a, 0xe7, 0x36, 0x88, + 0x47, 0x58, 0x8c, 0xa9, 0xb6, 0xf1, 0x96, 0xc5, 0xdc, 0x0f, 0x3f, 0x9f, 0xe8, 0xa6, 0xd7, 0xcb, + 0x69, 0xd6, 0xda, 0x7a, 0x9b, 0xe9, 0x1c, 0x4e, 0xea, 0x86, 0x16, 0x76, 0xd1, 0xc1, 0xaa, 0x1a, + 0x6c, 0x3d, 0x72, 0x0c, 0x6d, 0xf7, 0x0c, 0x18, 0x8c, 0xa6, 0x28, 0x63, 0x4d, 0xbf, 0x35, 0x34, + 0x3e, 0x73, 0xd0, 0x3b, 0x31, 0x5a, 0xa8, 0x6a, 0x25, 0x1c, 0xfe, 0x04, 0x6b, 0xd7, 0xf6, 0xe3, + 0xcf, 0x9c, 0xaf, 0x4d, 0x6d, 0xee, 0xbc, 0xff, 0x00, 0x3e, 0xc9, 0xeb, 0xd0, 0xd8, 0xdc, 0x82, + 0xc1, 0x6a, 0x6a, 0x78, 0xac, 0xe9, 0xdc, 0xb5, 0x86, 0xa7, 0xff, 0x5e, 0x2b, 0x32, 0x3a, 0x9c, + 0x03, 0x82, 0x83, 0xfb, 0xbe, 0x1e, 0xfc, 0xc4, 0x1e, 0xe3, 0xa4, 0x91, 0x86, 0xa4, 0xef, 0x8b, + 0xf0, 0xa2, 0x7a, 0x2b, 0x3c, 0xce, 0x58, 0x7d, 0xf9, 0x9a, 0xf9, 0x7b, 0x47, 0x59, 0x45, 0xb7, + 0x9b, 0x48, 0x55, 0xd1, 0xff, 0x75, 0x3a, 0x6f, 0x9e, 0xfd, 0x68, 0x81, 0x4a, 0x37, 0x82, 0x1f, + 0x76, 0xfb, 0xfd, 0x45, 0xda, 0xd6, 0xf4, 0xbd, 0x25, 0xc6, 0x4b, 0x7f, 0xdc, 0x1a, 0x34, 0xe8, + 0x54, 0xdd, 0x15, 0x73, 0xf3, 0x8c, 0x12, 0xaa, 0x5a, 0x88, 0xb7, 0x7c, 0xec, 0xe0, 0xde, 0x09, + 0x3e, 0xc2, 0xc9, 0xce, 0x01, 0x8a, 0x38, 0x6a, 0xa2, 0x35, 0xee, 0x12, 0x75, 0xbb, 0x74, 0xa3, + 0xee, 0x1e, 0x5b, 0xb7, 0x2e, 0x93, 0xa9, 0x4f, 0x90, 0xa7, 0x2a, 0xce, 0xc8, 0x5e, 0xf3, 0x73, + 0x13, 0x56, 0x77, 0x3a, 0xf9, 0x07, 0x0b, 0xfe, 0xdb, 0x0b, 0xc8, 0x8b, 0xe7, 0x4a, 0xc1, 0x3c, + 0x77, 0xb1, 0xfa, 0xe0, 0xab, 0x81, 0x8a, 0xce, 0xb9, 0xf1, 0xab, 0x5b, 0x73, 0xf4, 0xe5, 0x4c, + 0x53, 0xeb, 0xd3, 0x06, 0xc5, 0x34, 0xd5, 0xb2, 0x2e, 0x7e, 0xc6, 0x96, 0x1e, 0x37, 0x51, 0x84, + 0xfe, 0xe5, 0x3c, 0xbb, 0x68, 0x7a, 0x29, 0x74, 0xbe, 0x4b, 0x50, 0x68, 0xf6, 0x48, 0xbe, 0xb2, + 0x89, 0xb6, 0x7f, 0x73, 0xea, 0xee, 0x03, 0x8f, 0xe8, 0x39, 0x32, 0xd2, 0x48, 0x1e, 0x10, 0xae, + 0x64, 0x0c, 0xf9, 0x5f, 0xe4, 0x2d, 0x9d, 0xea, 0xc4, 0x95, 0xc7, 0xbb, 0x8b, 0x23, 0x2e, 0xda, + 0x71, 0xe4, 0xc2, 0xe7, 0x2d, 0xff, 0x1b, 0xc0, 0xf8, 0x47, 0x1e, 0xb0, 0x6f, 0x75, 0x78, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE axis3d_back_xpm[1] = {{ png, sizeof( png ), "axis3d_back_xpm" }}; diff --git a/bitmaps_png/cpp_26/axis3d_front.cpp b/bitmaps_png/cpp_26/axis3d_front.cpp index 875f3c6b58..c70a5470b3 100644 --- a/bitmaps_png/cpp_26/axis3d_front.cpp +++ b/bitmaps_png/cpp_26/axis3d_front.cpp @@ -8,90 +8,91 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x05, 0x22, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x7b, 0x4c, 0x53, - 0x57, 0x1c, 0xc7, 0x0f, 0x2f, 0x85, 0xa1, 0x43, 0x51, 0xc4, 0x69, 0x9c, 0xd3, 0xa1, 0x43, 0xf7, - 0xd2, 0x2c, 0x33, 0x73, 0x33, 0x4e, 0xb7, 0x3f, 0x30, 0x30, 0xa8, 0x1d, 0x14, 0xfa, 0x6e, 0xa1, - 0x50, 0x4a, 0x0b, 0x8a, 0x80, 0x82, 0x65, 0xa8, 0x20, 0x38, 0x50, 0xd1, 0xa9, 0x81, 0x15, 0x54, - 0x64, 0xb0, 0xcc, 0x17, 0x1a, 0x11, 0x4d, 0x71, 0xc8, 0x1c, 0xc3, 0x17, 0x28, 0x4e, 0x97, 0x88, - 0xe0, 0x0b, 0xc7, 0x94, 0x39, 0x79, 0x6b, 0x7d, 0xd0, 0xc2, 0xfd, 0xee, 0xdc, 0x3a, 0x9d, 0xa5, - 0x80, 0xb8, 0xb8, 0x6f, 0x72, 0x92, 0x7b, 0x4f, 0x4e, 0xce, 0x27, 0xbf, 0xc7, 0xf9, 0x9e, 0x43, - 0xc8, 0x20, 0x65, 0xcf, 0x11, 0x7a, 0xd9, 0x71, 0xc4, 0x3b, 0x89, 0xb7, 0x20, 0x81, 0xf8, 0xc9, - 0xe6, 0x12, 0x1e, 0x6f, 0x08, 0x79, 0xa9, 0xfa, 0x40, 0xe9, 0xe0, 0xca, 0x57, 0x6e, 0x1a, 0x2f, - 0x8d, 0x32, 0xb8, 0x85, 0xc4, 0x62, 0x4a, 0x6c, 0x3a, 0xe3, 0x2a, 0x8b, 0x66, 0x86, 0x06, 0x28, - 0x98, 0xa1, 0x81, 0x61, 0x3d, 0xce, 0x82, 0x70, 0xc3, 0x70, 0xbe, 0xea, 0xaa, 0x8d, 0xaf, 0xb8, - 0x88, 0xf8, 0x08, 0xb5, 0xc4, 0x4f, 0x38, 0x9f, 0xcc, 0x93, 0x3b, 0xbe, 0x18, 0xc4, 0x57, 0x32, - 0x89, 0x42, 0x6a, 0x35, 0xd9, 0xf9, 0x06, 0xfd, 0xd9, 0xf3, 0x98, 0x9d, 0x9c, 0x8d, 0xf8, 0x33, - 0x2d, 0x88, 0x3a, 0xd9, 0x84, 0x90, 0x63, 0xd7, 0xc1, 0x2d, 0x3e, 0x87, 0x8f, 0xb7, 0xeb, 0xe1, - 0xb9, 0xae, 0x00, 0xe3, 0xb5, 0x1b, 0xe1, 0x1a, 0x91, 0xc8, 0x38, 0x8a, 0x34, 0x8c, 0x2d, 0x57, - 0xce, 0xd8, 0x70, 0xe5, 0x3d, 0xf6, 0x01, 0x8a, 0x0e, 0x1a, 0xb9, 0xdd, 0x80, 0x0c, 0x47, 0xae, - 0x4c, 0x34, 0x4a, 0x10, 0xde, 0x7a, 0xf8, 0xcc, 0xaf, 0x0c, 0xa8, 0x2a, 0x2f, 0xd6, 0x61, 0xf6, - 0xaa, 0x2d, 0xd0, 0xd6, 0xb4, 0x61, 0x11, 0x05, 0x05, 0x53, 0x50, 0x40, 0xe9, 0x45, 0x2c, 0x28, - 0xae, 0xc1, 0x27, 0x7b, 0x4e, 0xe0, 0xbd, 0xc2, 0xa3, 0x98, 0xbc, 0xed, 0x10, 0xdc, 0xb2, 0x8a, - 0xe0, 0x98, 0x59, 0x00, 0x22, 0x5d, 0x0c, 0xe2, 0x27, 0x01, 0x9b, 0x91, 0xbe, 0x09, 0x3c, 0x9e, - 0x93, 0x9b, 0x30, 0x22, 0x6f, 0x56, 0x4c, 0x52, 0xc7, 0xad, 0xd6, 0x36, 0x3c, 0x51, 0x55, 0xfd, - 0x55, 0xcc, 0xd4, 0x66, 0x9a, 0x21, 0xa1, 0x15, 0x37, 0x20, 0x28, 0xab, 0x87, 0xdf, 0xa1, 0x0b, - 0xf8, 0x6c, 0x5f, 0x15, 0x3e, 0xdc, 0x59, 0x81, 0x69, 0xf9, 0x47, 0x30, 0x21, 0xa7, 0x18, 0x23, - 0x36, 0xef, 0x86, 0x6d, 0x78, 0x02, 0x48, 0xe8, 0x32, 0xd8, 0x2c, 0x94, 0x33, 0xfd, 0xa4, 0x4a, - 0xf0, 0xb6, 0xab, 0x20, 0xbc, 0x21, 0xb1, 0x60, 0xcf, 0xc3, 0x1e, 0x86, 0xc1, 0xb3, 0xba, 0xd0, - 0xf0, 0x3b, 0xa6, 0xc7, 0xa5, 0x41, 0x5a, 0x7e, 0x05, 0x81, 0x47, 0x2e, 0xc1, 0x97, 0x42, 0x3e, - 0xdf, 0x5f, 0x8d, 0x8f, 0x76, 0x55, 0xe2, 0xdd, 0x82, 0x32, 0x4c, 0xda, 0xfa, 0x38, 0x1a, 0x87, - 0xa8, 0x64, 0x1a, 0x4d, 0x34, 0x48, 0xfa, 0x76, 0x0a, 0x92, 0x59, 0x81, 0x6c, 0x86, 0xf9, 0x87, - 0x68, 0x5e, 0x93, 0x68, 0xda, 0x8e, 0xd7, 0xd6, 0xa3, 0x2f, 0xd5, 0xdd, 0x6c, 0x82, 0x47, 0xf4, - 0x2a, 0x0a, 0x38, 0x0f, 0xaf, 0x03, 0x67, 0xf1, 0x69, 0xd1, 0x29, 0xcc, 0xda, 0xf9, 0x0b, 0xde, - 0xa1, 0x10, 0x36, 0x65, 0xee, 0xd9, 0xfb, 0xe0, 0x18, 0xbf, 0x0e, 0x44, 0xa0, 0x06, 0xf9, 0x7a, - 0x1b, 0x48, 0x46, 0x9e, 0x35, 0x88, 0x46, 0x51, 0x6a, 0xc7, 0x91, 0x20, 0x6d, 0x77, 0x31, 0x73, - 0xba, 0xee, 0x2a, 0x1e, 0x76, 0x19, 0xad, 0x40, 0x37, 0xfe, 0x6a, 0xc6, 0xeb, 0xea, 0x44, 0x73, - 0x3d, 0x58, 0xc0, 0x8c, 0xc2, 0x72, 0x78, 0xee, 0x28, 0xc5, 0xc4, 0xdc, 0x83, 0x8f, 0xeb, 0x92, - 0xb8, 0x11, 0x24, 0x48, 0x05, 0x92, 0x9a, 0x63, 0x86, 0x98, 0x23, 0xe2, 0xf4, 0x02, 0x8d, 0x95, - 0x68, 0x4e, 0x46, 0xe7, 0x16, 0xc2, 0x37, 0x25, 0x93, 0xf1, 0x50, 0xc6, 0x98, 0x46, 0xf0, 0x95, - 0xcc, 0x1b, 0x8a, 0xe8, 0x9e, 0xc0, 0xf4, 0xcd, 0xa6, 0xec, 0xc3, 0x47, 0x99, 0x33, 0x97, 0xaf, - 0xa3, 0xf1, 0x4e, 0x0b, 0xc6, 0x29, 0x97, 0x62, 0x7a, 0xfe, 0x8f, 0x98, 0x92, 0xa7, 0xa7, 0x80, - 0x12, 0x8c, 0xfd, 0x76, 0xbf, 0xb9, 0x26, 0x43, 0x56, 0x66, 0x81, 0xf0, 0xc2, 0x40, 0x68, 0x57, - 0x9a, 0x21, 0xec, 0xa0, 0x51, 0xd9, 0x72, 0x83, 0x7b, 0x2c, 0x40, 0xe3, 0x64, 0x51, 0xfa, 0xde, - 0x29, 0xbb, 0xd3, 0x71, 0x17, 0x05, 0x3f, 0x55, 0x42, 0x92, 0xa9, 0x63, 0x66, 0x44, 0x69, 0x8d, - 0x63, 0xc4, 0xea, 0x1e, 0x5b, 0x8e, 0x14, 0xce, 0x91, 0x2b, 0x30, 0x6c, 0x79, 0x26, 0x86, 0xa5, - 0xe6, 0xc2, 0x69, 0x7d, 0x21, 0x6c, 0x92, 0xff, 0x81, 0x24, 0x6d, 0xfa, 0x17, 0xc2, 0x8e, 0xb4, - 0x5c, 0xd8, 0x7e, 0x29, 0xef, 0xee, 0x15, 0x91, 0x7a, 0x57, 0x69, 0xcd, 0x05, 0x0c, 0xa4, 0x07, - 0x5d, 0x5d, 0x18, 0x2e, 0x8a, 0x80, 0x43, 0xc2, 0x7a, 0xd8, 0x68, 0xbe, 0xa2, 0x05, 0x5f, 0x04, - 0xe2, 0x1f, 0x0a, 0x22, 0xd2, 0x80, 0xd0, 0x6e, 0xb4, 0x80, 0xb0, 0x23, 0x55, 0x07, 0x3b, 0xff, - 0x10, 0xa3, 0x05, 0x68, 0x8c, 0x48, 0x95, 0x5b, 0x74, 0xa2, 0x7a, 0x40, 0x10, 0xdb, 0x85, 0x2e, - 0x22, 0xb5, 0xf5, 0x86, 0x3c, 0xe5, 0xd3, 0xe2, 0x5b, 0x8c, 0x94, 0x6c, 0x0a, 0x52, 0x3c, 0xb2, - 0x00, 0x8d, 0x0c, 0x52, 0xae, 0xfd, 0xae, 0xbc, 0x12, 0xcf, 0x93, 0x8b, 0x30, 0xc2, 0x7a, 0xc3, - 0xa0, 0x70, 0x90, 0x35, 0x5b, 0xad, 0xe7, 0x69, 0x4a, 0xa9, 0x33, 0xdc, 0xb7, 0x00, 0x0d, 0x59, - 0x28, 0x5b, 0x9e, 0x75, 0xb8, 0x6c, 0x40, 0x88, 0x4e, 0x5f, 0x8e, 0x89, 0x8a, 0x25, 0x70, 0x11, - 0xab, 0xa9, 0xd5, 0x2c, 0x87, 0xdd, 0xe2, 0x14, 0x90, 0x27, 0x9d, 0x96, 0x96, 0x63, 0x0d, 0x5a, - 0xb9, 0x99, 0x05, 0xdd, 0xb5, 0x3c, 0x45, 0x5f, 0x88, 0x34, 0x19, 0x45, 0x25, 0xdd, 0xfd, 0xa5, - 0xec, 0x76, 0x7b, 0x07, 0x54, 0x59, 0x79, 0x68, 0x37, 0xdc, 0x87, 0xd1, 0xd4, 0x8d, 0xb3, 0x57, - 0xae, 0x23, 0xf3, 0x80, 0x1e, 0xde, 0xa9, 0xdf, 0xc0, 0x86, 0xda, 0xcc, 0x70, 0x1a, 0xe9, 0xc8, - 0xc8, 0x24, 0x90, 0x98, 0x35, 0x66, 0x00, 0xdb, 0xda, 0x6c, 0x73, 0xd8, 0xf3, 0x42, 0xdb, 0x2c, - 0x41, 0x3e, 0x22, 0x19, 0xeb, 0x06, 0xbd, 0x21, 0x8f, 0x8c, 0x46, 0x70, 0x56, 0x6f, 0xc0, 0xda, - 0x7d, 0x87, 0xfa, 0x8d, 0x74, 0x92, 0x22, 0xba, 0xfb, 0x78, 0x6d, 0x1d, 0xf6, 0x1e, 0xaf, 0x82, - 0x4a, 0x97, 0x0f, 0xcf, 0x48, 0x2d, 0x5e, 0xa5, 0xe0, 0x57, 0x24, 0x91, 0x70, 0xe0, 0x29, 0x6e, - 0xf7, 0xb2, 0x1e, 0xb1, 0xbf, 0x46, 0x97, 0x7f, 0xf7, 0xd9, 0x0d, 0x58, 0x9f, 0x63, 0xfd, 0xad, - 0xa4, 0xfa, 0xdc, 0x80, 0x29, 0x7d, 0x33, 0x74, 0x89, 0xa9, 0xfe, 0xe6, 0x9f, 0x16, 0x73, 0x6c, - 0xd4, 0x73, 0x96, 0xa6, 0x18, 0x9c, 0xb8, 0x8a, 0x78, 0x4b, 0x90, 0xb7, 0x78, 0x81, 0x24, 0x33, - 0xbb, 0xfd, 0xc9, 0x42, 0xd6, 0x19, 0xa6, 0x47, 0x2c, 0x43, 0xf1, 0xe9, 0x9a, 0xe7, 0x36, 0x88, - 0x47, 0x58, 0x8c, 0xa9, 0xb6, 0xf1, 0x96, 0xc5, 0xdc, 0x0f, 0x3f, 0x9f, 0xe8, 0xa6, 0xd7, 0xcb, - 0x69, 0xd6, 0xda, 0x7a, 0x9b, 0xe9, 0x1c, 0x4e, 0xea, 0x86, 0x16, 0x76, 0xd1, 0xc1, 0xaa, 0x1a, - 0x6c, 0x3d, 0x72, 0x0c, 0x6d, 0xf7, 0x0c, 0x18, 0x8c, 0xa6, 0x28, 0x63, 0x4d, 0xbf, 0x35, 0x34, - 0x3e, 0x73, 0xd0, 0x3b, 0x31, 0x5a, 0xa8, 0x6a, 0x25, 0x1c, 0xfe, 0x04, 0x6b, 0xd7, 0xf6, 0xe3, - 0xcf, 0x9c, 0xaf, 0x4d, 0x6d, 0xee, 0xbc, 0xff, 0x00, 0x3e, 0xc9, 0xeb, 0xd0, 0xd8, 0xdc, 0x82, - 0xc1, 0x6a, 0x6a, 0x78, 0xac, 0xe9, 0xdc, 0xb5, 0x86, 0xa7, 0xff, 0x5e, 0x2b, 0x32, 0x3a, 0x9c, - 0x03, 0x82, 0x83, 0xfb, 0xbe, 0x1e, 0xfc, 0xc4, 0x1e, 0xe3, 0xa4, 0x91, 0x86, 0xa4, 0xef, 0x8b, - 0xf0, 0xa2, 0x7a, 0x2b, 0x3c, 0xce, 0x58, 0x7d, 0xf9, 0x9a, 0xf9, 0x7b, 0x47, 0x59, 0x45, 0xb7, - 0x9b, 0x48, 0x55, 0xd1, 0xff, 0x75, 0x3a, 0x6f, 0x9e, 0xfd, 0x68, 0x81, 0x4a, 0x37, 0x82, 0x1f, - 0x76, 0xfb, 0xfd, 0x45, 0xda, 0xd6, 0xf4, 0xbd, 0x25, 0xc6, 0x4b, 0x7f, 0xdc, 0x1a, 0x34, 0xe8, - 0x54, 0xdd, 0x15, 0x73, 0xf3, 0x8c, 0x12, 0xaa, 0x5a, 0x88, 0xb7, 0x7c, 0xec, 0xe0, 0xde, 0x09, - 0x3e, 0xc2, 0xc9, 0xce, 0x01, 0x8a, 0x38, 0x6a, 0xa2, 0x35, 0xee, 0x12, 0x75, 0xbb, 0x74, 0xa3, - 0xee, 0x1e, 0x5b, 0xb7, 0x2e, 0x93, 0xa9, 0x4f, 0x90, 0xa7, 0x2a, 0xce, 0xc8, 0x5e, 0xf3, 0x73, - 0x13, 0x56, 0x77, 0x3a, 0xf9, 0x07, 0x0b, 0xfe, 0xdb, 0x0b, 0xc8, 0x8b, 0xe7, 0x4a, 0xc1, 0x3c, - 0x77, 0xb1, 0xfa, 0xe0, 0xab, 0x81, 0x8a, 0xce, 0xb9, 0xf1, 0xab, 0x5b, 0x73, 0xf4, 0xe5, 0x4c, - 0x53, 0xeb, 0xd3, 0x06, 0xc5, 0x34, 0xd5, 0xb2, 0x2e, 0x7e, 0xc6, 0x96, 0x1e, 0x37, 0x51, 0x84, - 0xfe, 0xe5, 0x3c, 0xbb, 0x68, 0x7a, 0x29, 0x74, 0xbe, 0x4b, 0x50, 0x68, 0xf6, 0x48, 0xbe, 0xb2, - 0x89, 0xb6, 0x7f, 0x73, 0xea, 0xee, 0x03, 0x8f, 0xe8, 0x39, 0x32, 0xd2, 0x48, 0x1e, 0x10, 0xae, - 0x64, 0x0c, 0xf9, 0x5f, 0xe4, 0x2d, 0x9d, 0xea, 0xc4, 0x95, 0xc7, 0xbb, 0x8b, 0x23, 0x2e, 0xda, - 0x71, 0xe4, 0xc2, 0xe7, 0x2d, 0xff, 0x1b, 0xc0, 0xf8, 0x47, 0x1e, 0xb0, 0x6f, 0x75, 0x78, 0x00, - 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x05, 0x33, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0xd6, 0x79, 0x4c, 0x93, + 0x67, 0x1c, 0x07, 0xf0, 0x87, 0x8a, 0x47, 0xbd, 0xa6, 0x80, 0x32, 0x20, 0x9b, 0xd3, 0x2c, 0xf3, + 0x0f, 0x37, 0xdd, 0x8c, 0x59, 0xe2, 0xa6, 0x8b, 0xc6, 0x73, 0x32, 0xe4, 0xb2, 0xf4, 0x82, 0xb6, + 0x54, 0xe9, 0x05, 0x0c, 0x14, 0x07, 0x2a, 0xa0, 0x4e, 0x86, 0x58, 0x70, 0x43, 0x64, 0x72, 0x08, + 0x11, 0x10, 0x25, 0xa0, 0x53, 0x4e, 0x07, 0x28, 0x08, 0x55, 0x04, 0x15, 0x1c, 0x1e, 0xc1, 0x33, + 0xe2, 0x7d, 0x15, 0x2b, 0x16, 0x15, 0x95, 0xb6, 0xef, 0x77, 0x6f, 0xbb, 0xd0, 0x50, 0x0e, 0xe9, + 0x96, 0xf9, 0x24, 0x4f, 0xde, 0xb4, 0xe9, 0xf3, 0x7c, 0xde, 0xe7, 0xf7, 0x7b, 0xfa, 0x7b, 0x1e, + 0x42, 0xac, 0x6d, 0xcb, 0x04, 0x9f, 0x11, 0x57, 0x1e, 0x87, 0xb8, 0xf9, 0xce, 0x24, 0x2c, 0xd6, + 0x68, 0xf2, 0x3e, 0xda, 0x68, 0xd6, 0x2a, 0xb9, 0x3d, 0x4f, 0xd2, 0x31, 0x37, 0x22, 0xa6, 0x6b, + 0x41, 0xe4, 0xd6, 0x76, 0x67, 0x41, 0x90, 0x76, 0x3c, 0x47, 0xa2, 0x71, 0x11, 0x06, 0x5d, 0x9c, + 0x24, 0x0e, 0x3d, 0xc8, 0xf4, 0x12, 0x87, 0xd1, 0x2f, 0xb1, 0x84, 0xb8, 0xf9, 0x4d, 0x26, 0x9b, + 0x37, 0x33, 0xfe, 0xbd, 0xe0, 0x21, 0x1a, 0xe7, 0xc0, 0x95, 0x96, 0x2f, 0x8a, 0x8a, 0xd3, 0xde, + 0x78, 0xf8, 0x18, 0x2d, 0x77, 0xef, 0xa3, 0xbb, 0xe9, 0xf4, 0x7a, 0x5c, 0x7f, 0xf0, 0x08, 0x25, + 0x67, 0xce, 0x21, 0xfe, 0x50, 0xa9, 0x9e, 0xbf, 0x7d, 0x57, 0xfb, 0x8c, 0xe0, 0x0d, 0x6d, 0xf4, + 0x0b, 0x68, 0xed, 0x79, 0xd2, 0x7b, 0x4e, 0x7e, 0x81, 0x35, 0xf6, 0x3c, 0x79, 0xd4, 0xe0, 0xc8, + 0x0f, 0xdc, 0xd9, 0xf4, 0xa0, 0x87, 0x3b, 0x8a, 0x2b, 0xde, 0x52, 0x14, 0x85, 0x9a, 0x8b, 0x97, + 0x21, 0x4a, 0x4c, 0x87, 0x35, 0xad, 0xfd, 0xe5, 0x2b, 0x2c, 0x88, 0x8c, 0xd3, 0x8f, 0xf0, 0xf2, + 0xd7, 0xbd, 0x8b, 0xb0, 0x19, 0xcf, 0x91, 0x46, 0x4c, 0x12, 0x87, 0xb4, 0x37, 0xdf, 0xbc, 0x6d, + 0x1e, 0x7c, 0xeb, 0x89, 0x1a, 0x85, 0x0d, 0x4d, 0x56, 0x41, 0xe1, 0xd9, 0xf9, 0x7a, 0x3a, 0xac, + 0x86, 0x31, 0xac, 0x95, 0x2f, 0xfb, 0x27, 0x96, 0x73, 0x1d, 0xed, 0x79, 0xb2, 0x86, 0x15, 0x71, + 0x49, 0x1d, 0x2f, 0x5f, 0xbf, 0xb1, 0x18, 0x6c, 0x84, 0xd2, 0xcb, 0xab, 0x07, 0x45, 0x92, 0x4a, + 0x2b, 0x29, 0x47, 0x5f, 0x85, 0xa1, 0xf5, 0xb1, 0x1a, 0xe3, 0xd8, 0x92, 0x67, 0x7d, 0x0c, 0x5b, + 0x0f, 0xe1, 0x62, 0x7b, 0xae, 0x44, 0xbd, 0xbf, 0xf6, 0x94, 0xbe, 0xbf, 0x09, 0xfe, 0xba, 0x79, + 0x0b, 0x9e, 0xb1, 0x89, 0xef, 0x44, 0x72, 0x6b, 0xea, 0xa8, 0x09, 0x7c, 0xb9, 0xa1, 0x3b, 0x97, + 0x1f, 0xf8, 0x04, 0x68, 0x2c, 0x77, 0x15, 0x5b, 0x7a, 0x88, 0xe9, 0x23, 0xc1, 0xf7, 0x9b, 0x12, + 0x90, 0x53, 0x7d, 0x02, 0x9a, 0x8e, 0x17, 0x7d, 0x26, 0x79, 0xab, 0xd3, 0xe1, 0xd1, 0xb3, 0xe7, + 0x03, 0x22, 0xc6, 0x4d, 0x61, 0xc7, 0x93, 0x1a, 0x1a, 0xaf, 0xb7, 0x9a, 0x3e, 0x77, 0xe9, 0xf4, + 0xa0, 0x73, 0xac, 0xb6, 0x80, 0x46, 0xb2, 0x65, 0x0d, 0x0b, 0x53, 0x8a, 0xb0, 0x38, 0xa5, 0x88, + 0x9a, 0x16, 0xf1, 0xab, 0x7e, 0x2c, 0x3f, 0x90, 0x1a, 0xc9, 0x96, 0x1a, 0x26, 0x4b, 0x7e, 0xea, + 0x62, 0x29, 0x93, 0x91, 0x79, 0xb4, 0x16, 0x75, 0x97, 0xaf, 0x61, 0xe9, 0x26, 0x65, 0xbf, 0xc8, + 0xc9, 0x96, 0xab, 0xb0, 0xe3, 0x4a, 0x0c, 0xaa, 0x4b, 0x57, 0xa8, 0xee, 0xef, 0x3a, 0x3a, 0x5f, + 0xc3, 0x9e, 0x2b, 0xbd, 0x6f, 0x09, 0x71, 0xe4, 0xe5, 0x5e, 0x05, 0x75, 0x08, 0x3b, 0xa3, 0x46, + 0x78, 0xe3, 0x53, 0xac, 0x39, 0xfd, 0x04, 0x32, 0xd5, 0x1d, 0xb8, 0x1f, 0xac, 0xc7, 0xac, 0x1d, + 0xf9, 0x94, 0xcb, 0x9a, 0xad, 0x3a, 0x26, 0x47, 0x4e, 0x31, 0x96, 0x0b, 0xe0, 0x20, 0x08, 0xd6, + 0x2f, 0x8a, 0x8e, 0xa7, 0xb6, 0xfd, 0x51, 0x82, 0xbb, 0xea, 0x36, 0x5c, 0xb8, 0x7d, 0x07, 0x74, + 0x5e, 0x0d, 0x47, 0x1a, 0x9b, 0xa9, 0x9e, 0x78, 0x9b, 0xb6, 0x03, 0x13, 0xf9, 0xf2, 0x56, 0x0b, + 0x88, 0xc9, 0x96, 0xe6, 0x2f, 0xda, 0x53, 0x01, 0xc9, 0x89, 0x3b, 0x90, 0x9d, 0xbc, 0x0b, 0x09, + 0x8d, 0x88, 0x8e, 0xdf, 0x04, 0xbb, 0xf2, 0x0a, 0xdc, 0xca, 0x2e, 0x60, 0xc1, 0xe1, 0xb3, 0xf8, + 0x7a, 0x5f, 0x0d, 0x26, 0x29, 0xb3, 0xe0, 0x1c, 0x9f, 0x8d, 0xd1, 0xe1, 0x09, 0x94, 0xad, 0x38, + 0x4c, 0x6f, 0xe3, 0xbd, 0x92, 0x62, 0x78, 0x0a, 0x91, 0x5c, 0x5a, 0x69, 0xe8, 0xbd, 0xca, 0x7b, + 0x6d, 0x1a, 0x38, 0xf2, 0x15, 0x57, 0x2c, 0xa0, 0xe1, 0x2b, 0x02, 0x76, 0xcf, 0xde, 0x75, 0x18, + 0x9c, 0xa3, 0x57, 0xc1, 0x3b, 0x76, 0xcd, 0xf4, 0xf4, 0x2e, 0x6f, 0xa1, 0x91, 0xf3, 0x58, 0x58, + 0xd8, 0x88, 0x6f, 0x0f, 0x9c, 0xc2, 0xe7, 0x19, 0x65, 0x60, 0x0a, 0x43, 0xe1, 0x92, 0x56, 0x84, + 0x71, 0x3b, 0x0b, 0x30, 0x74, 0x7b, 0x0e, 0x88, 0x72, 0x0f, 0x6c, 0x04, 0x21, 0x86, 0xf2, 0xa6, + 0x0b, 0x7d, 0xc2, 0x69, 0xfc, 0x83, 0x3b, 0x09, 0x02, 0x9b, 0x2d, 0x77, 0x9c, 0xa7, 0x38, 0xfe, + 0x8b, 0x84, 0x5c, 0x2c, 0x2b, 0x69, 0x86, 0x6b, 0xe9, 0x79, 0xd3, 0x73, 0x71, 0x51, 0x13, 0xe6, + 0x1f, 0x3a, 0x83, 0x6f, 0xe8, 0x90, 0xce, 0xa4, 0x57, 0x33, 0x35, 0xf3, 0x08, 0x26, 0x6c, 0x49, + 0x85, 0xc3, 0xef, 0x07, 0x31, 0xf2, 0xb7, 0x7d, 0x26, 0xa4, 0x1b, 0x2a, 0x3b, 0xdb, 0xdc, 0x07, + 0xba, 0x74, 0xfb, 0x1e, 0xe8, 0x52, 0xd5, 0x60, 0x01, 0x31, 0x96, 0x0b, 0xd7, 0x4f, 0x8e, 0x49, + 0xc7, 0x9c, 0x03, 0xf5, 0x98, 0x4b, 0xe7, 0x65, 0x0e, 0xbd, 0x82, 0xd9, 0x05, 0x27, 0x31, 0x2b, + 0xaf, 0x16, 0xd3, 0x73, 0xab, 0x30, 0x35, 0xab, 0x02, 0x8e, 0x5b, 0x33, 0x30, 0x4c, 0xb4, 0x1a, + 0x23, 0xd6, 0x25, 0x80, 0x11, 0x93, 0x06, 0xf2, 0x4b, 0x5a, 0x37, 0xa4, 0x2f, 0x3e, 0x7d, 0xae, + 0x0f, 0xd4, 0x74, 0xa3, 0x15, 0x2e, 0x82, 0xa0, 0xda, 0x5e, 0xe5, 0x86, 0x1f, 0xe8, 0xb8, 0x21, + 0x51, 0x6f, 0x9c, 0x74, 0x46, 0x6e, 0x35, 0xa6, 0xef, 0xad, 0xc2, 0xb4, 0x9c, 0xa3, 0x26, 0x60, + 0x4a, 0x66, 0x19, 0x9c, 0x12, 0xf3, 0x30, 0x6a, 0x4d, 0x2c, 0x46, 0x44, 0x25, 0x82, 0x11, 0xbd, + 0x03, 0x64, 0x6d, 0x1c, 0x08, 0x5b, 0x06, 0x12, 0x95, 0x04, 0xe2, 0x25, 0xa6, 0x56, 0xed, 0xcc, + 0x80, 0xf6, 0x55, 0x27, 0x9e, 0x3c, 0xd7, 0x9a, 0x21, 0xe3, 0x2e, 0x75, 0x16, 0x06, 0x97, 0x5b, + 0x42, 0xae, 0x7c, 0xe1, 0xd8, 0xd5, 0xb1, 0xaf, 0x3f, 0xc9, 0x28, 0x45, 0x77, 0xff, 0x38, 0xbd, + 0x18, 0xce, 0xa9, 0x85, 0x60, 0x06, 0x6e, 0xc4, 0xd0, 0x55, 0xe1, 0x60, 0xd2, 0xe1, 0xb2, 0x89, + 0xcf, 0x32, 0x87, 0xcc, 0x1c, 0x3a, 0xbe, 0x42, 0xbf, 0x2e, 0x3b, 0xdf, 0xb4, 0xc5, 0xbf, 0xfc, + 0x71, 0x03, 0xf2, 0x54, 0xf5, 0x88, 0x2d, 0x28, 0x86, 0x7f, 0xd2, 0x6e, 0x38, 0xf9, 0x29, 0x0a, + 0x2d, 0x21, 0x37, 0x5f, 0xef, 0x61, 0x8a, 0xa8, 0x0e, 0xbb, 0xe4, 0x03, 0x30, 0xf6, 0xf1, 0xc9, + 0x05, 0x18, 0x9b, 0x90, 0x83, 0xe1, 0xe1, 0x4a, 0x0c, 0xdb, 0xb2, 0x0b, 0x43, 0x12, 0xb2, 0xfb, + 0x00, 0x3d, 0x72, 0xa4, 0xcb, 0x57, 0x35, 0x58, 0x84, 0xcd, 0x58, 0x23, 0x67, 0x04, 0xaf, 0xef, + 0x1c, 0xe3, 0x23, 0x0e, 0xe8, 0x75, 0xa8, 0xf9, 0x2e, 0xb5, 0x11, 0x87, 0xb5, 0x1b, 0x27, 0xb4, + 0xa5, 0x01, 0xe3, 0x93, 0x9e, 0xe0, 0x9f, 0x10, 0x0d, 0x00, 0xf4, 0x84, 0xf6, 0xd7, 0xd6, 0x5b, + 0x40, 0x79, 0x74, 0x19, 0xb3, 0xe3, 0x48, 0x4e, 0x1b, 0x0b, 0x74, 0xaf, 0x15, 0x71, 0xe7, 0x10, + 0x61, 0xc8, 0x53, 0xd3, 0xe0, 0xb0, 0x58, 0x90, 0x80, 0xf0, 0x41, 0x01, 0x33, 0xe4, 0x17, 0xa2, + 0xdb, 0x5b, 0x5d, 0x67, 0x46, 0xd4, 0x74, 0x9e, 0x1c, 0x78, 0x32, 0x0d, 0x71, 0xe7, 0x7c, 0xd4, + 0x4f, 0xd5, 0xe6, 0x7c, 0x45, 0xf8, 0x8a, 0x36, 0xf2, 0x73, 0x0a, 0x88, 0x22, 0x9a, 0xde, 0x51, + 0xe9, 0xd6, 0x43, 0x82, 0x90, 0xae, 0xac, 0x2a, 0x95, 0x19, 0x5a, 0xb2, 0x51, 0xf9, 0x7c, 0xd4, + 0x0a, 0x7f, 0xff, 0x01, 0x8e, 0x07, 0xdf, 0x4f, 0x89, 0xa7, 0xa8, 0x93, 0xc8, 0x22, 0xad, 0x06, + 0x7a, 0x42, 0x99, 0x95, 0xb5, 0x26, 0x24, 0xeb, 0x98, 0x4a, 0x3f, 0x81, 0x2f, 0x53, 0x0d, 0x7c, + 0xd4, 0xcd, 0x9b, 0x67, 0x4b, 0xdc, 0x45, 0xa9, 0xf4, 0xd1, 0xfd, 0x98, 0xb0, 0xa5, 0x1a, 0x12, + 0xb4, 0xb1, 0x8b, 0x6c, 0x4e, 0xb6, 0x1a, 0xda, 0x5d, 0x71, 0x1c, 0x0f, 0x34, 0xcf, 0x8c, 0x35, + 0xef, 0x29, 0x59, 0x26, 0xfa, 0xd0, 0xba, 0x7b, 0x82, 0x2b, 0x6f, 0x0a, 0x71, 0x17, 0xae, 0x25, + 0x5e, 0xfe, 0xe7, 0x88, 0x97, 0xa8, 0x9d, 0xac, 0x5c, 0xfb, 0x82, 0x44, 0x28, 0x41, 0xb6, 0x65, + 0x0e, 0x08, 0xa5, 0xfe, 0x59, 0x85, 0xef, 0xd6, 0xc5, 0x68, 0x99, 0xde, 0xfe, 0xdc, 0xff, 0x76, + 0xfd, 0x59, 0xc2, 0xb2, 0xa3, 0x61, 0x16, 0xf1, 0xf0, 0x2f, 0x21, 0xee, 0x02, 0x2d, 0xe1, 0x05, + 0x69, 0x48, 0x68, 0x0c, 0x45, 0x62, 0xd2, 0x7a, 0x40, 0xa1, 0x6f, 0x17, 0x46, 0xc6, 0x19, 0xe8, + 0x03, 0xaf, 0xfc, 0xff, 0xb9, 0x73, 0x19, 0xc3, 0xeb, 0xca, 0x9b, 0x4f, 0x3c, 0x84, 0x29, 0x74, + 0x7f, 0x48, 0x7c, 0x24, 0x6d, 0x24, 0x30, 0xfa, 0x8d, 0x0d, 0x57, 0xde, 0x35, 0xdc, 0x98, 0x5f, + 0x4f, 0xbf, 0x89, 0xef, 0xe5, 0xae, 0x67, 0xba, 0x50, 0xba, 0x09, 0x22, 0x18, 0x9e, 0xe2, 0x96, + 0x21, 0xee, 0x02, 0xde, 0x60, 0x3f, 0xff, 0x1b, 0x73, 0x06, 0xe5, 0x5c, 0xf9, 0x44, 0x86, 0x22, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE axis3d_front_xpm[1] = {{ png, sizeof( png ), "axis3d_front_xpm" }}; diff --git a/bitmaps_png/sources/axis3d_back.svg b/bitmaps_png/sources/axis3d_back.svg index 0a55e59c51..b8810f4d19 100644 --- a/bitmaps_png/sources/axis3d_back.svg +++ b/bitmaps_png/sources/axis3d_back.svg @@ -1,15 +1,20 @@ - + - + - + + + - - - - - + + + + + + + + diff --git a/bitmaps_png/sources/axis3d_front.svg b/bitmaps_png/sources/axis3d_front.svg index b8810f4d19..0a55e59c51 100644 --- a/bitmaps_png/sources/axis3d_front.svg +++ b/bitmaps_png/sources/axis3d_front.svg @@ -1,20 +1,15 @@ - + - + - - - + - - - - - - - - + + + + +