From ee33f0f1d7de609f3e7c48e5c2bf40b95c5f80cb Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Mon, 19 Nov 2018 13:46:56 +0100 Subject: [PATCH] Add missing icons --- resources/icons/overlay/cut_hover.png | Bin 0 -> 2812 bytes resources/icons/overlay/cut_off.png | Bin 0 -> 2769 bytes resources/icons/overlay/cut_on.png | Bin 0 -> 2447 bytes src/slic3r/GUI/Plater.cpp | 29 ++++++++++---------------- 4 files changed, 11 insertions(+), 18 deletions(-) create mode 100644 resources/icons/overlay/cut_hover.png create mode 100644 resources/icons/overlay/cut_off.png create mode 100644 resources/icons/overlay/cut_on.png diff --git a/resources/icons/overlay/cut_hover.png b/resources/icons/overlay/cut_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..99dc4cf8dbef9bf88bc6fa0a903705c400a815ed GIT binary patch literal 2812 zcmVyRv`cY3W-TX zK~#9!<(qqKQ`a5GKi78byn_={LW5mMNgSFLWvL6K0X00vpy3W7m>Se>>dM+KRo6|0 zGL5Q}+D%MA2Zd_dN*4{aE2W5{DVOpXq$Mg@6%hqcU|Ae1a~dZEC&aZA5}cR!hi^=r zhvTMp>}g-gfB4>W&%NK@`JMB7og)xth@zMSECX_Z2j$-!API<wP8n_Qg1rkHleGkwjYe)s~S4ol@qCx8jU?> zv$-j(8X$^d60i~YHSiG8g?eB&P%cT5E94p=iefrY3hW2ci9XB*MBuK`Xf&J6=AMuV zKorFXfM3ZYuZ%QPl}bfsW+wCJ&nGoC6}Q`s+wC6VvkK4{jmCeO&1UDfngXII3V>c# zt*0VQeAcX4tXZ>$qM{-U27~W=E?nUB>C?2fwvJr>5ZDE@NRs54mIfG&#&lpO z@LZ(H>-Boxc;gLLtXM%xN(wh_+@QX`9-GZZLP7%h`T49`wFgfO-&6Z zlZpKNe6C%)Mn^}73djd6X0y3&qP`WAjD8XDI*<}+@|l^Lm`o<@b~|NdWq3T3PG`RQ z>MM>MIRe0zEn5%-0hz;ZWKL5HKorFc;HR=%JJLzSke!{4APAf~b&B5J-YMJH)YRZ` zILOV-B_YA5yxG8WGPfx;U<>d>v>122UJu|m=L5m*c60giW#Z!ENKf~3SJuniCKrGl zyO#i3-zphl4Nxc)zIh&W=-AWaTO3D03v3ldaZw-*cpk{}i#P(zxtW07?u~I06N8Ve z7cKH~bUMfRL3uLA@d6M<(EtlOgZmMshF`SkR3j7B34hl7rejn9b&4rR?;qmKVQSQ5faX)YQcA@GvHm$rlI2#l?}Bn227lr?9Y)7hil4 zlgUJ9XD7RN@20)IJy4eez;(0P+@z8(Y>>mrkd1Jt*N%@r{+N!A4oXT&C@d_bu&{7k zo2sfRKKS4R+S=NJ4V}-A2w(;GQq&=z$DzV!pM6GERTUkkE>_@8U;jVhCa_usEFEk5X42%Pq@<9PltfZe5?Za6#Kc4{U%pIN zS68@S9}6s10pG=2um~$+Vq#dlcrlrondo#nQd3izJ$p8D=FA~BHWsB)={J}6?Aa6c zPXcmPK-NqMpt!i0XPOqR`c@9FB2CR=W}$*%ggV@u3GI(d`7$?QbxG6wA2^2*4EbY$tR!q;&_16 z)YO^DH{jizFr!$%em$#KuLhvKy`6&x590B7=;-L6udfflFYg~l^eO=0d(NqnGtrRq@?i5E3f!W+|i>)u~;nk zLbQPa?%cWKvjpE3!^6XYZVv&S3c!YUOG;Rw(P-GdeYJ7B1HQ#Bf*1g9Oe-7~1ObD=fWcruqtVdU*GFSxqc4Ly8FF%Ra5|k6rnDjz z4hsOHDAwXl83&cDGZ+jM6&0b=>Ck92ba!`Sv)QGT66oU$l^&2)AX|puwViq zeX)KN;i}A$2?ZcYQax}KaEu<2!NEb2lao=Yf=eB$)oPSVWwcoV2XIv8$YdG-Z~{0z zI-=_7=|QK{k(QPg)SEIhGl_|bp{1oIngno0=0-pPNRreF`~~lpbUYpp7K;UiLczLq z>w;>RPN znp&;KU@(xFn25{eqPe;G8*OC^GyVv?B}tNXO3yRc9*c{M4IYo@=Yk;oLZMK^5S&LO~F8QAWNV?>VOTB}uv+bnG#mH;JP7J>W;c zW+GHt8baoBiqqAB zK~#9!?OT6rQ`Z&#{A|DH*iIfv9wY%`5-bzqdbf z9U13`-8B9owMV*t*zdk~-}&x$&$;Kkb7hFX&;V2b7ywGr6aXjyGSWu^AOZ-G<_F*< zO^D~q$>Q`}4QXirwgkpQ>|2*cBv z#V;ciQJNzlBwP8=Br;?Pio}CR@c=*pfR)STIg%vFk$NI0o<|}eh%>nalmId*ipms4 zQJU_0`wEKPBYM4Fxqtuu;+&kEOpnLoJ#*$vXG=?qBdp6H00#l$D+8b)l+Pf)gGrcK z0KoR`+qt^By3P6d`42G+vv|xch@!`8wVF0ru6~hWm_h*Xcsy-huh%M*$rM_xb{S36^F>h{?&#=fT(M$Bi_hniD2j55 zqIh>I5U3~yk0mWx$^!rl2E*K4yLSDNVVFXm=gmf=aidnN{Tat`wb|L(PnDIGJ=E6L zW{@PwzjW!+y%vk*SLD{v`%}|lKn8$0=*+Yr$ZU=Q!@+ix)3G7_I+~9Xp-?Ais0x&bjN?ulpw1*0YfS zgpi?94S<%G7Dsz~`yT*c{rdI4Gn>uj6ZI=EFHh_3?R|#hxE~6F&{tPi_wp1QyfLQB z!YpLYBn${983Q>0bai#@TDWlGF9Cq(d9%f0dCzLKexXvSn1X_WlKlMqO$@^<2m}JQ z6DLmWs;a8GF~u|e0PX-74goNS_d5na>#MK6dbGa2 zz9)vX+7JMH2!I7sSpSp(0016%;DNN~pMQR>PN(~pN~M}3Ns`~`boRXa?z@+F?AUSh zOFY*Hphrgh;{1trNht!rjOP=G1OW6ZNGd65uCJn^VntC=QMyj2%h2g`SuD$HjYi`K z=gysLOF$}3C5y8DXN&>4xw%CL4<7vXvSrH_XJut^85tSbTCH}DTCL8dC@M`ZmygX< zPfyQ33knLh#hC#j0H=aj{yGCm^9|O<`eSNg@DHBr5RPx^?T>ef##^@_0N#S6A0yM@Prd zrAwFo{mLt^{N%C69xJ0H;^&_i=!|gZeF0ey862>yzs&?rBay| z3}VyN_f)qz<~qbuc)Y~Cf>kz=+L3x zo~{MnmoHy_J>K*O z;7{0A*km$QZQ8VHF90~5&dxP!);xXV#*P0bF&Gj7I4O*ln#7#}4u@kH00cpB9yoB| zP=b_?#sHrpQ2;#t_~WnJY__4!&Q9lRuf6tu3WUiL0B#=vhrcITAim* zC{%(V3_2W+Tg}bQ=Z_pYVoT+O%0vkf#9#*i0DJcA$u$@ZyE%@loM;CrilXQC?c2x8 z%F14}TCKqp24GxDOoP#+=ww+T96o%wpr)qg7{f4&0)c?FySw{TM@L7y!{Ko2bh;e9 zUSFD*m-l0eqSAPt|64&p!PDeJW-0;@z-Us`BMS=+^GSASoaps><@M{=-&CnoOZxl! zPw(8h^Es2rH12cr(W6Hf?%cWah)SheYPDMbGO;^OyBCX+SE08kUq-wjfB z8-8&RlN1##S+Zn309?3m!8q0Tc>t)ZtLwgb^X4%CSiO4nI;5WXF;3GOtx;_MqmYt3nE|13}0`MyoicGy;AJfNEold8c z$z<|mgxXOuTP{RYnNQ^RT?nho=XqZA`~5>SP3J!H$RjzijI?FTmJ*pvM!Vhat`q`b znCOOR00aq< z)YjJOIgXpv*Vo54G&Fqn`RAVp;+0XFN;YraoEZ_D%xJlMC?HBxDwT_EHXH45IEIj# zB9U1iiZ=6K8i0_|EGjC}4Gauud7c+iOnHH*1&J$7R(;_} z*m|E9BjsNad2dAUl!%Y5A{o;iM)_%bns1KI#%Y$mmWQXOVn*cgc{wINJ|9GakI(-f X`3>!?!WdHJ00000NkvXXu0mjffwVm9 literal 0 HcmV?d00001 diff --git a/resources/icons/overlay/cut_on.png b/resources/icons/overlay/cut_on.png new file mode 100644 index 0000000000000000000000000000000000000000..7e78e0e6a3a0f36ce2a8a85e4ebdfa9ab6ec62c1 GIT binary patch literal 2447 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 N002ovPDHLkV1hbhW7_}# literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 8dc221aad..3b3e30235 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -999,10 +999,8 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) })) , notebook(new wxNotebook(q, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM)) , sidebar(new Sidebar(q)) - // , panel3d(new wxPanel(notebook, wxID_ANY)) - , panel3d(nullptr) - // , canvas3D(GLCanvas3DManager::create_wxglcanvas(panel3d)) - , canvas3D(GLCanvas3DManager::create_wxglcanvas(notebook)) + , panel3d(new wxPanel(notebook, wxID_ANY)) + , canvas3D(GLCanvas3DManager::create_wxglcanvas(panel3d)) #if ENABLE_NEW_MENU_LAYOUT , project_filename(wxEmptyString) #endif // ENABLE_NEW_MENU_LAYOUT @@ -1030,21 +1028,17 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) _3DScene::add_canvas(canvas3D); _3DScene::allow_multisample(canvas3D, GLCanvas3DManager::can_multisample()); - // XXX: reverting panel3d and panel_gizmo_widgets - // ! cf. on_notebook_changed + auto *panel3dsizer = new wxBoxSizer(wxVERTICAL); + panel3dsizer->Add(canvas3D, 1, wxEXPAND); + auto *panel_gizmo_widgets = new wxPanel(panel3d, wxID_ANY); + panel_gizmo_widgets->SetSizer(new wxBoxSizer(wxVERTICAL)); + panel3dsizer->Add(panel_gizmo_widgets, 0, wxEXPAND); - // auto *panel3dsizer = new wxBoxSizer(wxVERTICAL); - // panel3dsizer->Add(canvas3D, 1, wxEXPAND); - // auto *panel_gizmo_widgets = new wxPanel(panel3d, wxID_ANY); - // panel_gizmo_widgets->SetSizer(new wxBoxSizer(wxVERTICAL)); - // panel3dsizer->Add(panel_gizmo_widgets, 0, wxEXPAND); - - // panel3d->SetSizer(panel3dsizer); - // notebook->AddPage(panel3d, _(L("3D"))); - notebook->AddPage(canvas3D, _(L("3D"))); + panel3d->SetSizer(panel3dsizer); + notebook->AddPage(panel3d, _(L("3D"))); preview = new GUI::Preview(notebook, config, &print, &gcode_preview_data, [this](){ schedule_background_process(); }); - // _3DScene::get_canvas(canvas3D)->set_external_gizmo_widgets_parent(panel_gizmo_widgets); + _3DScene::get_canvas(canvas3D)->set_external_gizmo_widgets_parent(panel_gizmo_widgets); // XXX: If have OpenGL _3DScene::enable_picking(canvas3D, true); @@ -1824,8 +1818,7 @@ void Plater::priv::fix_through_netfabb(const int obj_idx) void Plater::priv::on_notebook_changed(wxBookCtrlEvent&) { const auto current_id = notebook->GetCurrentPage()->GetId(); - // if (current_id == panel3d->GetId()) { - if (current_id == canvas3D->GetId()) { + if (current_id == panel3d->GetId()) { if (_3DScene::is_reload_delayed(canvas3D)) { // Delayed loading of the 3D scene. if (this->printer_technology == ptSLA) {