FIX: N3S AMS display
jira: none Change-Id: Ib6f4bdd0ada9df2d1aacc33568507471e29897c1
This commit is contained in:
hang.xu
lane.wei
parent
fe8b904e75
commit
ac1a1d69a1
|
Before Width: | Height: | Size: 805 B After Width: | Height: | Size: 805 B |
|
|
@ -0,0 +1,7 @@
|
|||
<svg width="53" height="76" viewBox="0 0 53 76" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<ellipse cx="9.67253" cy="38.1605" rx="7.85417" ry="36.3636" fill="#F8F8F8" stroke="#ACACAC" stroke-width="2"/>
|
||||
<ellipse cx="9.06844" cy="38.767" rx="1.20833" ry="5.45455" fill="#ACACAC"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M43.5058 74.5241C47.8436 74.5241 51.36 58.2436 51.36 38.1605C51.36 18.0774 47.8436 1.79688 43.5058 1.79688C41.7373 1.79688 40.1052 4.50326 38.7924 9.07031H41.1907C41.2357 9.07031 41.2749 9.09921 41.2867 9.1426C43.0924 15.7359 44.11 26.5477 44.11 38.7673C44.11 50.2633 42.9144 60.5134 41.2853 67.177C41.2744 67.2217 41.2345 67.2521 41.1885 67.2521H38.7928C40.1055 71.8183 41.7374 74.5241 43.5058 74.5241Z" fill="#F8F8F8"/>
|
||||
<path d="M38.7924 9.07031L37.8313 8.79404L37.4644 10.0703H38.7924V9.07031ZM41.2867 9.1426L40.3222 9.40673L40.3223 9.40673L41.2867 9.1426ZM41.2853 67.177L40.3139 66.9395L40.3139 66.9396L41.2853 67.177ZM38.7928 67.2521V66.2521H37.4648L37.8317 67.5284L38.7928 67.2521ZM50.36 38.1605C50.36 48.153 49.4844 57.1698 48.0821 63.6624C47.3792 66.9168 46.5551 69.4832 45.6724 71.2117C45.2304 72.0774 44.7986 72.6827 44.401 73.0594C44.0079 73.4319 43.7122 73.5241 43.5058 73.5241V75.5241C44.3839 75.5241 45.147 75.1077 45.7765 74.5113C46.4014 73.9193 46.956 73.0957 47.4536 72.1213C48.4503 70.1696 49.3186 67.4107 50.037 64.0846C51.4773 57.4161 52.36 48.2511 52.36 38.1605H50.36ZM43.5058 2.79688C43.7122 2.79688 44.0079 2.88917 44.401 3.26159C44.7986 3.63834 45.2304 4.24363 45.6724 5.1093C46.5551 6.83777 47.3792 9.4042 48.0821 12.6587C49.4844 19.1512 50.36 28.168 50.36 38.1605H52.36C52.36 28.0699 51.4773 18.9049 50.037 12.2364C49.3186 8.91035 48.4503 6.15145 47.4536 4.19972C46.956 3.22529 46.4014 2.40176 45.7765 1.80972C45.147 1.21335 44.3839 0.796875 43.5058 0.796875V2.79688ZM39.7534 9.34659C40.3985 7.10251 41.103 5.38844 41.8221 4.25751C42.5744 3.07423 43.164 2.79688 43.5058 2.79688V0.796875C42.079 0.796875 40.9683 1.87271 40.1343 3.18439C39.267 4.54842 38.499 6.47106 37.8313 8.79404L39.7534 9.34659ZM38.7924 10.0703H41.1907V8.07031H38.7924V10.0703ZM41.1907 10.0703C40.8005 10.0703 40.4334 9.81256 40.3222 9.40673L42.2512 8.87847C42.1163 8.38586 41.6709 8.07031 41.1907 8.07031V10.0703ZM40.3223 9.40673C42.0925 15.8708 43.11 26.577 43.11 38.7673H45.11C45.11 26.5185 44.0923 15.6011 42.2512 8.87846L40.3223 9.40673ZM43.11 38.7673C43.11 50.2066 41.9192 60.3734 40.3139 66.9395L42.2567 67.4145C43.9097 60.6533 45.11 50.32 45.11 38.7673H43.11ZM40.3139 66.9396C40.4156 66.5236 40.7872 66.2521 41.1885 66.2521V68.2521C41.6818 68.2521 42.1331 67.9199 42.2567 67.4145L40.3139 66.9396ZM41.1885 66.2521H38.7928V68.2521H41.1885V66.2521ZM43.5058 73.5241C43.1641 73.5241 42.5746 73.2469 41.8223 72.0639C41.1033 70.9332 40.3989 69.2195 39.7538 66.9758L37.8317 67.5284C38.4994 69.851 39.2674 71.7733 40.1346 73.1371C40.9686 74.4485 42.0792 75.5241 43.5058 75.5241V73.5241Z" fill="#ACACAC"/>
|
||||
<path d="M14.3856 67.2521L13.4246 66.9758L13.0576 68.2521H14.3856V67.2521ZM14.386 9.07031V8.07031H13.0581L13.425 9.34659L14.386 9.07031ZM41.2868 9.1426L40.3223 9.40673L40.3223 9.40673L41.2868 9.1426ZM41.2854 67.177L40.314 66.9395L40.314 66.9395L41.2854 67.177ZM16.5267 38.1605C16.5267 50.0076 15.2961 60.4661 13.4246 66.9758L15.3467 67.5284C17.2899 60.7695 18.5267 50.1048 18.5267 38.1605H16.5267ZM13.425 9.34659C15.2963 15.8564 16.5267 26.3143 16.5267 38.1605H18.5267C18.5267 26.217 17.2901 15.5531 15.3471 8.79404L13.425 9.34659ZM41.1908 8.07031H14.386V10.0703H41.1908V8.07031ZM42.2513 8.87847C42.1164 8.38586 41.671 8.07031 41.1908 8.07031V10.0703C40.8006 10.0703 40.4335 9.81256 40.3223 9.40673L42.2513 8.87847ZM45.11 38.7673C45.11 26.5185 44.0924 15.6011 42.2513 8.87846L40.3223 9.40673C42.0926 15.8708 43.11 26.577 43.11 38.7673H45.11ZM42.2567 67.4145C43.9097 60.6533 45.11 50.32 45.11 38.7673H43.11C43.11 50.2066 41.9193 60.3734 40.314 66.9395L42.2567 67.4145ZM41.1886 68.2521C41.6818 68.2521 42.1332 67.9199 42.2567 67.4145L40.314 66.9395C40.4157 66.5235 40.7874 66.2521 41.1886 66.2521V68.2521ZM14.3856 68.2521H41.1886V66.2521H14.3856V68.2521Z" fill="#ACACAC"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
|
|
@ -0,0 +1,7 @@
|
|||
<svg width="53" height="76" viewBox="0 0 53 76" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<ellipse cx="9.80827" cy="38.1605" rx="7.85417" ry="36.3636" fill="#F8F8F8" stroke="#909090" stroke-width="2"/>
|
||||
<ellipse cx="9.20418" cy="38.767" rx="1.20833" ry="5.45455" fill="#909090"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6416 74.5241C47.9793 74.5241 51.4957 58.2436 51.4957 38.1605C51.4957 18.0774 47.9793 1.79688 43.6416 1.79688C41.873 1.79688 40.2409 4.50326 38.9281 9.07031H41.3265C41.3715 9.07031 41.4106 9.09921 41.4225 9.1426C43.2281 15.7359 44.2457 26.5477 44.2457 38.7673C44.2457 50.2633 43.0502 60.5134 41.421 67.177C41.4101 67.2217 41.3702 67.2521 41.3242 67.2521H38.9285C40.2413 71.8183 41.8732 74.5241 43.6416 74.5241Z" fill="#F8F8F8"/>
|
||||
<path d="M38.9281 9.07031L37.967 8.79404L37.6001 10.0703H38.9281V9.07031ZM41.4225 9.1426L40.458 9.40673L40.458 9.40673L41.4225 9.1426ZM41.421 67.177L40.4496 66.9395L40.4496 66.9396L41.421 67.177ZM38.9285 67.2521V66.2521H37.6005L37.9674 67.5284L38.9285 67.2521ZM50.4957 38.1605C50.4957 48.153 49.6202 57.1698 48.2178 63.6624C47.5149 66.9168 46.6908 69.4832 45.8082 71.2117C45.3661 72.0774 44.9344 72.6827 44.5367 73.0594C44.1436 73.4319 43.8479 73.5241 43.6416 73.5241V75.5241C44.5196 75.5241 45.2827 75.1077 45.9122 74.5113C46.5371 73.9193 47.0918 73.0957 47.5894 72.1213C48.586 70.1696 49.4544 67.4107 50.1728 64.0846C51.6131 57.4161 52.4957 48.2511 52.4957 38.1605H50.4957ZM43.6416 2.79688C43.8479 2.79688 44.1436 2.88917 44.5367 3.26159C44.9344 3.63834 45.3661 4.24363 45.8082 5.1093C46.6908 6.83777 47.5149 9.4042 48.2178 12.6587C49.6202 19.1512 50.4957 28.168 50.4957 38.1605H52.4957C52.4957 28.0699 51.6131 18.9049 50.1728 12.2364C49.4544 8.91035 48.586 6.15145 47.5894 4.19972C47.0918 3.22529 46.5371 2.40176 45.9122 1.80972C45.2827 1.21335 44.5196 0.796875 43.6416 0.796875V2.79688ZM39.8892 9.34659C40.5343 7.10251 41.2387 5.38844 41.9578 4.25751C42.7102 3.07423 43.2998 2.79688 43.6416 2.79688V0.796875C42.2148 0.796875 41.1041 1.87271 40.2701 3.18439C39.4028 4.54842 38.6348 6.47106 37.967 8.79404L39.8892 9.34659ZM38.9281 10.0703H41.3265V8.07031H38.9281V10.0703ZM41.3265 10.0703C40.9363 10.0703 40.5691 9.81256 40.458 9.40673L42.387 8.87847C42.2521 8.38586 41.8066 8.07031 41.3265 8.07031V10.0703ZM40.458 9.40673C42.2283 15.8708 43.2457 26.577 43.2457 38.7673H45.2457C45.2457 26.5185 44.228 15.6011 42.387 8.87846L40.458 9.40673ZM43.2457 38.7673C43.2457 50.2066 42.0549 60.3734 40.4496 66.9395L42.3924 67.4145C44.0454 60.6533 45.2457 50.32 45.2457 38.7673H43.2457ZM40.4496 66.9396C40.5513 66.5236 40.923 66.2521 41.3242 66.2521V68.2521C41.8175 68.2521 42.2689 67.9199 42.3924 67.4145L40.4496 66.9396ZM41.3242 66.2521H38.9285V68.2521H41.3242V66.2521ZM43.6416 73.5241C43.2998 73.5241 42.7103 73.2469 41.958 72.0639C41.239 70.9332 40.5346 69.2195 39.8896 66.9758L37.9674 67.5284C38.6352 69.851 39.4031 71.7733 40.2703 73.1371C41.1043 74.4485 42.2149 75.5241 43.6416 75.5241V73.5241Z" fill="#909090"/>
|
||||
<path d="M14.5214 67.2521L13.5603 66.9758L13.1934 68.2521H14.5214V67.2521ZM14.5218 9.07031V8.07031H13.1938L13.5607 9.34659L14.5218 9.07031ZM41.4226 9.1426L40.4581 9.40673L40.4581 9.40673L41.4226 9.1426ZM41.4211 67.177L40.4497 66.9395L40.4497 66.9395L41.4211 67.177ZM16.6625 38.1605C16.6625 50.0076 15.4318 60.4661 13.5603 66.9758L15.4824 67.5284C17.4256 60.7695 18.6625 50.1048 18.6625 38.1605H16.6625ZM13.5607 9.34659C15.432 15.8564 16.6625 26.3143 16.6625 38.1605H18.6625C18.6625 26.217 17.4258 15.5531 15.4829 8.79404L13.5607 9.34659ZM41.3265 8.07031H14.5218V10.0703H41.3265V8.07031ZM42.387 8.87847C42.2521 8.38586 41.8067 8.07031 41.3265 8.07031V10.0703C40.9363 10.0703 40.5692 9.81256 40.4581 9.40673L42.387 8.87847ZM45.2458 38.7673C45.2458 26.5185 44.2281 15.6011 42.387 8.87846L40.4581 9.40673C42.2283 15.8708 43.2458 26.577 43.2458 38.7673H45.2458ZM42.3925 67.4145C44.0455 60.6533 45.2458 50.32 45.2458 38.7673H43.2458C43.2458 50.2066 42.055 60.3734 40.4497 66.9395L42.3925 67.4145ZM41.3243 68.2521C41.8175 68.2521 42.2689 67.9199 42.3925 67.4145L40.4497 66.9395C40.5514 66.5235 40.9231 66.2521 41.3243 66.2521V68.2521ZM14.5214 68.2521H41.3243V66.2521H14.5214V68.2521Z" fill="#909090"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.1 KiB |
|
|
@ -0,0 +1,7 @@
|
|||
<svg width="52" height="76" viewBox="0 0 52 76" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<ellipse cx="8.86503" cy="38.1605" rx="7.85417" ry="36.3636" fill="#F8F8F8" stroke="#6B6B6B" stroke-width="2"/>
|
||||
<ellipse cx="8.26082" cy="38.767" rx="1.20833" ry="5.45455" fill="#6B6B6B"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M42.6983 74.5241C47.0361 74.5241 50.5525 58.2436 50.5525 38.1605C50.5525 18.0774 47.0361 1.79688 42.6983 1.79688C40.9298 1.79688 39.2977 4.50326 37.9849 9.07031H40.3832C40.4282 9.07031 40.4674 9.09921 40.4792 9.1426C42.2849 15.7359 43.3025 26.5477 43.3025 38.7673C43.3025 50.2633 42.1069 60.5134 40.4778 67.177C40.4669 67.2217 40.427 67.2521 40.381 67.2521H37.9853C39.2981 71.8183 40.9299 74.5241 42.6983 74.5241Z" fill="#F8F8F8"/>
|
||||
<path d="M37.9849 9.07031L37.0238 8.79404L36.6569 10.0703H37.9849V9.07031ZM40.4792 9.1426L39.5148 9.40673L39.5148 9.40673L40.4792 9.1426ZM40.4778 67.177L39.5064 66.9395L39.5064 66.9396L40.4778 67.177ZM37.9853 67.2521V66.2521H36.6573L37.0242 67.5284L37.9853 67.2521ZM49.5525 38.1605C49.5525 48.153 48.6769 57.1698 47.2746 63.6624C46.5717 66.9168 45.7476 69.4832 44.8649 71.2117C44.4229 72.0774 43.9911 72.6827 43.5935 73.0594C43.2004 73.4319 42.9047 73.5241 42.6983 73.5241V75.5241C43.5764 75.5241 44.3395 75.1077 44.969 74.5113C45.5939 73.9193 46.1485 73.0957 46.6461 72.1213C47.6428 70.1696 48.5111 67.4107 49.2295 64.0846C50.6698 57.4161 51.5525 48.2511 51.5525 38.1605H49.5525ZM42.6983 2.79688C42.9047 2.79688 43.2004 2.88917 43.5935 3.26159C43.9911 3.63834 44.4229 4.24363 44.8649 5.1093C45.7476 6.83777 46.5717 9.4042 47.2746 12.6587C48.6769 19.1512 49.5525 28.168 49.5525 38.1605H51.5525C51.5525 28.0699 50.6698 18.9049 49.2295 12.2364C48.5111 8.91035 47.6428 6.15145 46.6461 4.19972C46.1485 3.22529 45.5939 2.40176 44.969 1.80972C44.3395 1.21335 43.5764 0.796875 42.6983 0.796875V2.79688ZM38.9459 9.34659C39.591 7.10251 40.2955 5.38844 41.0146 4.25751C41.7669 3.07423 42.3565 2.79688 42.6983 2.79688V0.796875C41.2715 0.796875 40.1608 1.87271 39.3268 3.18439C38.4595 4.54842 37.6915 6.47106 37.0238 8.79404L38.9459 9.34659ZM37.9849 10.0703H40.3832V8.07031H37.9849V10.0703ZM40.3832 10.0703C39.993 10.0703 39.6259 9.81256 39.5148 9.40673L41.4437 8.87847C41.3088 8.38586 40.8634 8.07031 40.3832 8.07031V10.0703ZM39.5148 9.40673C41.285 15.8708 42.3025 26.577 42.3025 38.7673H44.3025C44.3025 26.5185 43.2848 15.6011 41.4437 8.87846L39.5148 9.40673ZM42.3025 38.7673C42.3025 50.2066 41.1117 60.3734 39.5064 66.9395L41.4492 67.4145C43.1022 60.6533 44.3025 50.32 44.3025 38.7673H42.3025ZM39.5064 66.9396C39.6081 66.5236 39.9797 66.2521 40.381 66.2521V68.2521C40.8743 68.2521 41.3256 67.9199 41.4492 67.4145L39.5064 66.9396ZM40.381 66.2521H37.9853V68.2521H40.381V66.2521ZM42.6983 73.5241C42.3566 73.5241 41.7671 73.2469 41.0148 72.0639C40.2958 70.9332 39.5914 69.2195 38.9463 66.9758L37.0242 67.5284C37.6919 69.851 38.4599 71.7733 39.3271 73.1371C40.1611 74.4485 41.2717 75.5241 42.6983 75.5241V73.5241Z" fill="#6B6B6B"/>
|
||||
<path d="M13.5781 67.2521L12.6171 66.9758L12.2501 68.2521H13.5781V67.2521ZM13.5785 9.07031V8.07031H12.2506L12.6175 9.34659L13.5785 9.07031ZM40.4793 9.1426L39.5148 9.40673L39.5148 9.40673L40.4793 9.1426ZM40.4779 67.177L39.5065 66.9395L39.5065 66.9395L40.4779 67.177ZM15.7192 38.1605C15.7192 50.0076 14.4886 60.4661 12.6171 66.9758L14.5392 67.5284C16.4824 60.7695 17.7192 50.1048 17.7192 38.1605H15.7192ZM12.6175 9.34659C14.4888 15.8564 15.7192 26.3143 15.7192 38.1605H17.7192C17.7192 26.217 16.4826 15.5531 14.5396 8.79404L12.6175 9.34659ZM40.3833 8.07031H13.5785V10.0703H40.3833V8.07031ZM41.4438 8.87847C41.3089 8.38586 40.8635 8.07031 40.3833 8.07031V10.0703C39.9931 10.0703 39.626 9.81256 39.5148 9.40673L41.4438 8.87847ZM44.3025 38.7673C44.3025 26.5185 43.2849 15.6011 41.4438 8.87846L39.5148 9.40673C41.2851 15.8708 42.3025 26.577 42.3025 38.7673H44.3025ZM41.4492 67.4145C43.1022 60.6533 44.3025 50.32 44.3025 38.7673H42.3025C42.3025 50.2066 41.1118 60.3734 39.5065 66.9395L41.4492 67.4145ZM40.3811 68.2521C40.8743 68.2521 41.3257 67.9199 41.4493 67.4145L39.5065 66.9395C39.6082 66.5235 39.9799 66.2521 40.3811 66.2521V68.2521ZM13.5781 68.2521H40.3811V66.2521H13.5781V68.2521Z" fill="#6B6B6B"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.1 KiB |
|
|
@ -3941,7 +3941,8 @@ void GUI_App::load_gcode(wxWindow* parent, wxString& input_file) const
|
|||
|
||||
wxString GUI_App::transition_tridid(int trid_id)
|
||||
{
|
||||
wxString maping_dict[8] = { "A", "B", "C", "D", "E", "F", "G" };
|
||||
//wxString maping_dict = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||
wxString maping_dict[] = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
|
||||
int id_index = ceil(trid_id / 4);
|
||||
int id_suffix = (trid_id + 1) % 4 == 0 ? 4 : (trid_id + 1) % 4;
|
||||
return wxString::Format("%s%d", maping_dict[id_index], id_suffix);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -38,6 +38,7 @@ protected:
|
|||
std::vector<AMSinfo> m_ams_info;
|
||||
std::vector<AMSinfo> m_ext_info;
|
||||
std::map<std::string, AmsItem*> m_ams_item_list;
|
||||
std::map<std::string, AMSExtImage*> m_ext_image_list;
|
||||
//std::map<std::string, AmsItem*> m_ams_generic_item_list;
|
||||
//std::map<std::string, AmsItem*> m_ams_extra_item_list;
|
||||
//std::map<std::string, Ams*> m_ams_list;
|
||||
|
|
@ -52,10 +53,10 @@ protected:
|
|||
|
||||
/*items*/
|
||||
wxBoxSizer* m_sizer_ams_items{nullptr};
|
||||
wxWindow* m_panel_items_left {nullptr};
|
||||
wxWindow* m_panel_items_right{nullptr};
|
||||
wxBoxSizer* m_sizer_items_left{nullptr};
|
||||
wxBoxSizer* m_sizer_items_right{nullptr};
|
||||
wxWindow* m_panel_prv_left {nullptr};
|
||||
wxWindow* m_panel_prv_right{nullptr};
|
||||
wxBoxSizer* m_sizer_prv_left{nullptr};
|
||||
wxBoxSizer* m_sizer_prv_right{nullptr};
|
||||
|
||||
/*ams */
|
||||
wxBoxSizer *m_sizer_ams_body{nullptr};
|
||||
|
|
@ -125,15 +126,18 @@ protected:
|
|||
|
||||
AmsHumidityTipPopup m_Humidity_tip_popup;
|
||||
|
||||
std::string m_last_ams_id = "-1";
|
||||
std::string m_last_tray_id = "-1";
|
||||
std::string m_last_ams_id = "";
|
||||
std::string m_last_tray_id = "";
|
||||
|
||||
public:
|
||||
std::string GetCurentAms();
|
||||
std::string GetCurentShowAms(bool right_panel = true);
|
||||
std::string GetCurentShowAms(AMSPanelPos pos = AMSPanelPos::RIGHT_PANEL);
|
||||
std::string GetCurrentCan(std::string amsid);
|
||||
bool IsAmsInRightPanel(std::string ams_id);
|
||||
wxColour GetCanColour(std::string amsid, std::string canid);
|
||||
void createAms(wxSimplebook* parent, int& idx, AMSinfo info, AMSPanelPos pos);
|
||||
void createAmsPanel(wxSimplebook* parent, int& idx, std::vector<AMSinfo>infos, AMSPanelPos pos);
|
||||
AMSRoadShowMode findFirstMode(AMSPanelPos pos);
|
||||
|
||||
AMSModel m_ams_model{AMSModel::EXT_AMS};
|
||||
AMSModel m_ext_model{AMSModel::EXT_AMS};
|
||||
|
|
@ -157,19 +161,20 @@ public:
|
|||
void UpdateStepCtrl(bool is_extrusion_exist);
|
||||
void UpdatePassRoad(string ams_id, AMSPassRoadType type, AMSPassRoadSTEP step);
|
||||
void CreateAms();
|
||||
void CreateAmsNew();
|
||||
void CreateAmsDoubleNozzle();
|
||||
void CreateAmsSingleNozzle();
|
||||
void ClearAms();
|
||||
void UpdateAms(std::vector<AMSinfo> ams_info, std::vector<AMSinfo> ext_info, int nozzle_num, std::string dev_id, bool is_reset = true, bool test = false);
|
||||
void ReadExtInfo(MachineObject* obj);
|
||||
std::vector<AMSinfo> GenerateSimulateData();
|
||||
|
||||
void AddAms(AMSinfo info, bool left = true);
|
||||
void AddAms(AMSinfo info, AMSPanelPos pos = AMSPanelPos::LEFT_PANEL);
|
||||
//void AddExtAms(int ams_id);
|
||||
void AddAmsPreview(AMSinfo info, AMSModel type);
|
||||
//void AddExtraAms(AMSinfo info);
|
||||
|
||||
void AddAms(std::vector<AMSinfo>single_info, bool left = true);
|
||||
void AddAmsPreview(std::vector<AMSinfo>single_info);
|
||||
void AddAms(std::vector<AMSinfo>single_info, AMSPanelPos pos = AMSPanelPos::LEFT_PANEL);
|
||||
void AddAmsPreview(std::vector<AMSinfo>single_info, AMSPanelPos pos);
|
||||
//void AddExtraAms(std::vector<AMSinfo>single_info);
|
||||
void SetExtruder(bool on_off, bool is_vams, std::string ams_now, wxColour col);
|
||||
void SetAmsStep(std::string ams_id, std::string canid, AMSPassRoadType type, AMSPassRoadSTEP step);
|
||||
|
|
|
|||
|
|
@ -242,17 +242,17 @@ void AMSrefresh::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, con
|
|||
Bind(wxEVT_LEAVE_WINDOW, &AMSrefresh::OnLeaveWindow, this);
|
||||
Bind(wxEVT_LEFT_DOWN, &AMSrefresh::OnClick, this);
|
||||
|
||||
m_bitmap_normal = ScalableBitmap(this, "ams_refresh_normal", 25);
|
||||
m_bitmap_selected = ScalableBitmap(this, "ams_refresh_selected", 25);
|
||||
m_bitmap_normal = ScalableBitmap(this, "ams_refresh_normal", 28);
|
||||
m_bitmap_selected = ScalableBitmap(this, "ams_refresh_selected", 28);
|
||||
|
||||
m_bitmap_ams_rfid_0 = ScalableBitmap(this, "ams_rfid_0", 25);
|
||||
m_bitmap_ams_rfid_1 = ScalableBitmap(this, "ams_rfid_1", 25);
|
||||
m_bitmap_ams_rfid_2 = ScalableBitmap(this, "ams_rfid_2", 25);
|
||||
m_bitmap_ams_rfid_3 = ScalableBitmap(this, "ams_rfid_3", 25);
|
||||
m_bitmap_ams_rfid_4 = ScalableBitmap(this, "ams_rfid_4", 25);
|
||||
m_bitmap_ams_rfid_5 = ScalableBitmap(this, "ams_rfid_5", 25);
|
||||
m_bitmap_ams_rfid_6 = ScalableBitmap(this, "ams_rfid_6", 25);
|
||||
m_bitmap_ams_rfid_7 = ScalableBitmap(this, "ams_rfid_7", 25);
|
||||
m_bitmap_ams_rfid_0 = ScalableBitmap(this, "ams_rfid_0", 28);
|
||||
m_bitmap_ams_rfid_1 = ScalableBitmap(this, "ams_rfid_1", 28);
|
||||
m_bitmap_ams_rfid_2 = ScalableBitmap(this, "ams_rfid_2", 28);
|
||||
m_bitmap_ams_rfid_3 = ScalableBitmap(this, "ams_rfid_3", 28);
|
||||
m_bitmap_ams_rfid_4 = ScalableBitmap(this, "ams_rfid_4", 28);
|
||||
m_bitmap_ams_rfid_5 = ScalableBitmap(this, "ams_rfid_5", 28);
|
||||
m_bitmap_ams_rfid_6 = ScalableBitmap(this, "ams_rfid_6", 28);
|
||||
m_bitmap_ams_rfid_7 = ScalableBitmap(this, "ams_rfid_7", 28);
|
||||
|
||||
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_0);
|
||||
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_1);
|
||||
|
|
@ -357,7 +357,7 @@ void AMSrefresh::paintEvent(wxPaintEvent &evt)
|
|||
}
|
||||
}
|
||||
|
||||
dc.SetFont(Label::Body_11);
|
||||
dc.SetFont(Label::Body_10);
|
||||
//dc.SetTextForeground(StateColor::darkModeColorFor(AMS_CONTROL_BLACK_COLOUR));
|
||||
dc.SetTextForeground(colour);
|
||||
auto tsize = dc.GetTextExtent(m_refresh_id);
|
||||
|
|
@ -380,16 +380,16 @@ void AMSrefresh::Update(std::string ams_id, Caninfo info)
|
|||
}
|
||||
|
||||
void AMSrefresh::msw_rescale() {
|
||||
m_bitmap_normal = ScalableBitmap(this, "ams_refresh_normal", 25);
|
||||
m_bitmap_selected = ScalableBitmap(this, "ams_refresh_selected", 25);
|
||||
m_bitmap_ams_rfid_0 = ScalableBitmap(this, "ams_rfid_0", 25);
|
||||
m_bitmap_ams_rfid_1 = ScalableBitmap(this, "ams_rfid_1", 25);
|
||||
m_bitmap_ams_rfid_2 = ScalableBitmap(this, "ams_rfid_2", 25);
|
||||
m_bitmap_ams_rfid_3 = ScalableBitmap(this, "ams_rfid_3", 25);
|
||||
m_bitmap_ams_rfid_4 = ScalableBitmap(this, "ams_rfid_4", 25);
|
||||
m_bitmap_ams_rfid_5 = ScalableBitmap(this, "ams_rfid_5", 25);
|
||||
m_bitmap_ams_rfid_6 = ScalableBitmap(this, "ams_rfid_6", 25);
|
||||
m_bitmap_ams_rfid_7 = ScalableBitmap(this, "ams_rfid_7", 25);
|
||||
m_bitmap_normal = ScalableBitmap(this, "ams_refresh_normal", 28);
|
||||
m_bitmap_selected = ScalableBitmap(this, "ams_refresh_selected", 28);
|
||||
m_bitmap_ams_rfid_0 = ScalableBitmap(this, "ams_rfid_0", 28);
|
||||
m_bitmap_ams_rfid_1 = ScalableBitmap(this, "ams_rfid_1", 28);
|
||||
m_bitmap_ams_rfid_2 = ScalableBitmap(this, "ams_rfid_2", 28);
|
||||
m_bitmap_ams_rfid_3 = ScalableBitmap(this, "ams_rfid_3", 28);
|
||||
m_bitmap_ams_rfid_4 = ScalableBitmap(this, "ams_rfid_4", 28);
|
||||
m_bitmap_ams_rfid_5 = ScalableBitmap(this, "ams_rfid_5", 28);
|
||||
m_bitmap_ams_rfid_6 = ScalableBitmap(this, "ams_rfid_6", 28);
|
||||
m_bitmap_ams_rfid_7 = ScalableBitmap(this, "ams_rfid_7", 28);
|
||||
|
||||
m_rfid_bitmap_list.clear();
|
||||
m_rfid_bitmap_list.push_back(m_bitmap_ams_rfid_0);
|
||||
|
|
@ -477,21 +477,21 @@ void AMSextruderImage::doRender(wxDC &dc)
|
|||
dc.SetBrush(*wxWHITE);
|
||||
dc.DrawRectangle(FromDIP(3), FromDIP(10), size.x - FromDIP(6), size.y - FromDIP(20));
|
||||
}
|
||||
dc.DrawBitmap(m_ams_extruder.bmp(), wxPoint((size.x - m_ams_extruder.GetBmpSize().x) / 2, (size.y - m_ams_extruder.GetBmpSize().y) / 2));
|
||||
dc.DrawBitmap(m_ams_extruder.bmp(), wxPoint((size.x - m_ams_extruder.GetBmpSize().x) / 2, 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
AMSextruderImage::AMSextruderImage(wxWindow *parent, wxWindowID id, string file_name, const wxPoint &pos, const wxSize &size)
|
||||
AMSextruderImage::AMSextruderImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos)
|
||||
{
|
||||
wxWindow::Create(parent, id, pos, AMS_EXTRUDER_BITMAP_SIZE);
|
||||
wxWindow::Create(parent, id, pos, size);
|
||||
SetBackgroundColour(*wxWHITE);
|
||||
|
||||
m_ams_extruder = ScalableBitmap(this, file_name,36);
|
||||
m_file_name = file_name;
|
||||
SetSize(AMS_EXTRUDER_BITMAP_SIZE);
|
||||
SetMinSize(AMS_EXTRUDER_BITMAP_SIZE);
|
||||
SetMaxSize(AMS_EXTRUDER_BITMAP_SIZE);
|
||||
SetSize(size);
|
||||
SetMinSize(size);
|
||||
SetMaxSize(size);
|
||||
|
||||
|
||||
Bind(wxEVT_PAINT, &AMSextruderImage::paintEvent, this);
|
||||
|
|
@ -506,15 +506,33 @@ AMSextruderImage::~AMSextruderImage() {}
|
|||
Description:AMSExtImage upon ext lib
|
||||
**************************************************/
|
||||
|
||||
AMSExtImage::AMSExtImage(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size)
|
||||
AMSExtImage::AMSExtImage(wxWindow* parent, bool single_flag, AMSPanelPos ext_pos, wxWindowID id, const wxPoint& pos, const wxSize& size)
|
||||
{
|
||||
wxWindow::Create(parent, id, pos, AMS_HUMIDITY_SIZE);
|
||||
if (!single_flag){
|
||||
wxWindow::Create(parent, id, pos, AMS_HUMIDITY_SIZE);
|
||||
}
|
||||
else{
|
||||
wxWindow::Create(parent, id, pos, wxSize(FromDIP(98), FromDIP(99)));
|
||||
}
|
||||
|
||||
SetBackgroundColour(StateColor::darkModeColorFor(AMS_CONTROL_DEF_LIB_BK_COLOUR));
|
||||
|
||||
m_single_flag = single_flag;
|
||||
m_ext_pos = ext_pos;
|
||||
/*if (single_flag){
|
||||
if (ext_pos == AMSPanelPos::LEFT_PANEL){
|
||||
m_ams_ext_left = ScalableBitmap(this, "ext_image_left", 98);
|
||||
}
|
||||
else{
|
||||
m_ams_ext_right = ScalableBitmap(this, "ext_image_right", 98);
|
||||
}
|
||||
}
|
||||
else{
|
||||
m_ams_ext = ScalableBitmap(this, "ams_ext_image", 25);
|
||||
}*/
|
||||
m_ams_ext_left = ScalableBitmap(this, "ext_image_left", 98);
|
||||
m_ams_ext_right = ScalableBitmap(this, "ext_image_right", 98);
|
||||
m_ams_ext = ScalableBitmap(this, "ams_ext_image", 25);
|
||||
/*SetSize(wxSize(FromDIP(78), FromDIP(50)));
|
||||
SetMinSize(wxSize(FromDIP(78), FromDIP(50)));
|
||||
SetMaxSize(wxSize(FromDIP(78), FromDIP(50)));*/
|
||||
|
||||
Bind(wxEVT_PAINT, &AMSExtImage::paintEvent, this);
|
||||
}
|
||||
|
|
@ -525,6 +543,8 @@ void AMSExtImage::msw_rescale()
|
|||
{
|
||||
//m_ams_extruder.SetSize(AMS_EXTRUDER_BITMAP_SIZE);
|
||||
//auto image = m_ams_extruder.ConvertToImage();
|
||||
m_ams_ext_left = ScalableBitmap(this, "ext_image_left", 98);
|
||||
m_ams_ext_right = ScalableBitmap(this, "ext_image_right", 98);
|
||||
m_ams_ext = ScalableBitmap(this, "ams_ext_image", 25);
|
||||
Layout();
|
||||
Fit();
|
||||
|
|
@ -563,12 +583,30 @@ void AMSExtImage::doRender(wxDC& dc)
|
|||
auto size = GetSize();
|
||||
dc.SetPen(*wxTRANSPARENT_PEN);
|
||||
//dc.DrawRectangle(0, FromDIP(5), size.x, size.y - FromDIP(5) - FromDIP(2));
|
||||
dc.DrawBitmap(m_ams_ext.bmp(), wxPoint((size.x - m_ams_ext.GetBmpSize().x) / 2, 0));
|
||||
if (m_single_flag) {
|
||||
if (m_ext_pos == AMSPanelPos::LEFT_PANEL) {
|
||||
dc.DrawBitmap(m_ams_ext_left.bmp(), wxPoint((size.x - m_ams_ext_left.GetBmpSize().x) / 2, (size.y - m_ams_ext_left.GetBmpSize().y) / 2));
|
||||
}
|
||||
else {
|
||||
dc.DrawBitmap(m_ams_ext_right.bmp(), wxPoint((size.x - m_ams_ext_right.GetBmpSize().x) / 2, (size.y - m_ams_ext_right.GetBmpSize().y) / 2));
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (m_ext_show) {
|
||||
dc.DrawBitmap(m_ams_ext.bmp(), wxPoint((size.x - m_ams_ext.GetBmpSize().x) / 2, 0));
|
||||
}
|
||||
}
|
||||
|
||||
Layout();
|
||||
}
|
||||
|
||||
|
||||
//Ams Extruder
|
||||
AMSextruder::AMSextruder(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size) { create(parent, id, pos, size); }
|
||||
AMSextruder::AMSextruder(wxWindow *parent, wxWindowID id, int nozzle_num, const wxPoint &pos, const wxSize &size)
|
||||
{
|
||||
create(parent, id, pos, size);
|
||||
m_nozzle_num = nozzle_num;
|
||||
}
|
||||
|
||||
AMSextruder::~AMSextruder() {}
|
||||
|
||||
|
|
@ -585,20 +623,31 @@ void AMSextruder::TurnOff()
|
|||
void AMSextruder::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size)
|
||||
{
|
||||
//wxWindow::Create(parent, id, pos, AMS_EXTRUDER_SIZE, wxBORDER_NONE);
|
||||
wxWindow::Create(parent, id, pos, wxSize(FromDIP(29), FromDIP(37)), wxBORDER_NONE);
|
||||
wxWindow::Create(parent, id, pos, wxSize(-1, FromDIP(36)), wxBORDER_NONE);
|
||||
//SetBackgroundColour(AMS_CONTROL_WHITE_COLOUR);
|
||||
SetBackgroundColour(*wxWHITE);
|
||||
/*SetSize(wxSize(FromDIP(29), FromDIP(37)));
|
||||
SetMinSize(wxSize(FromDIP(29), FromDIP(37)));*/
|
||||
|
||||
wxBoxSizer *m_sizer_body = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
m_bitmap_sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
m_left_extruder = new AMSextruderImage(this, wxID_ANY, "left_nozzle");
|
||||
m_left_extruder->update(true);
|
||||
m_right_extruder = new AMSextruderImage(this, wxID_ANY, "right_nozzle");
|
||||
m_right_extruder = new AMSextruderImage(this, wxID_ANY, "right_nozzle", AMS_EXTRUDER_DOUBLE_NOZZLE_BITMAP_SIZE);
|
||||
m_right_extruder->setShowState(false);
|
||||
|
||||
m_bitmap_sizer->Add(m_left_extruder, 0, wxLEFT, 0);
|
||||
m_bitmap_sizer->Add(m_right_extruder, 0, wxLEFT, 2);
|
||||
if (m_nozzle_num >= 2){
|
||||
m_left_extruder = new AMSextruderImage(this, wxID_ANY, "left_nozzle", AMS_EXTRUDER_DOUBLE_NOZZLE_BITMAP_SIZE);
|
||||
}
|
||||
else {
|
||||
m_left_extruder = new AMSextruderImage(this, wxID_ANY, "single_nozzle", AMS_EXTRUDER_SINGLE_NOZZLE_BITMAP_SIZE);
|
||||
}
|
||||
m_left_extruder->setShowState(true);
|
||||
|
||||
/*m_bitmap_sizer->Add(m_left_extruder, 0, wxLEFT, 0);
|
||||
m_bitmap_sizer->Add(m_right_extruder, 0, wxLEFT, 2);*/
|
||||
m_bitmap_sizer->Add(m_left_extruder, 0, wxLEFT | wxALIGN_TOP, 0);
|
||||
m_bitmap_sizer->Add(m_right_extruder, 0, wxLEFT | wxALIGN_TOP, FromDIP(2));
|
||||
SetSizer(m_bitmap_sizer);
|
||||
|
||||
Bind(wxEVT_PAINT, &AMSextruder::paintEvent, this);
|
||||
|
|
@ -629,10 +678,41 @@ void AMSextruder::OnAmsLoading(bool load, int nozzle_id, wxColour col /*= AMS_CO
|
|||
if (load) m_current_colur_deputy = col;
|
||||
}
|
||||
}
|
||||
|
||||
Refresh();
|
||||
}
|
||||
|
||||
void AMSextruder::updateNozzleNum(int nozzle_num)
|
||||
{
|
||||
if (m_nozzle_num == nozzle_num) return;
|
||||
m_nozzle_num = nozzle_num;
|
||||
this->DestroyChildren();
|
||||
|
||||
m_right_extruder = new AMSextruderImage(this, wxID_ANY, "right_nozzle", AMS_EXTRUDER_DOUBLE_NOZZLE_BITMAP_SIZE);
|
||||
m_right_extruder->setShowState(false);
|
||||
if (m_nozzle_num >= 2) {
|
||||
m_left_extruder = new AMSextruderImage(this, wxID_ANY, "left_nozzle", AMS_EXTRUDER_DOUBLE_NOZZLE_BITMAP_SIZE);
|
||||
/*SetSize(wxSize(FromDIP(29), FromDIP(37)));
|
||||
SetMinSize(wxSize(FromDIP(29), FromDIP(37)));*/
|
||||
}
|
||||
else {
|
||||
m_left_extruder = new AMSextruderImage(this, wxID_ANY, "single_nozzle", AMS_EXTRUDER_SINGLE_NOZZLE_BITMAP_SIZE);
|
||||
/*SetSize(wxSize(FromDIP(48), FromDIP(37)));
|
||||
SetMinSize(wxSize(FromDIP(48), FromDIP(37)));*/
|
||||
}
|
||||
wxBoxSizer *m_bitmap_sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
m_bitmap_sizer->Add(m_left_extruder, 0, wxALIGN_LEFT | wxALIGN_TOP, 0);
|
||||
if (m_nozzle_num >= 2){
|
||||
m_bitmap_sizer->Add(m_right_extruder, 0, wxLEFT | wxALIGN_TOP, FromDIP(2));
|
||||
m_bitmap_sizer->AddSpacer(2);
|
||||
}
|
||||
else{
|
||||
m_bitmap_sizer->Add(m_right_extruder, 0, wxLEFT | wxALIGN_TOP, FromDIP(3));
|
||||
}
|
||||
|
||||
SetSizer(m_bitmap_sizer);
|
||||
}
|
||||
|
||||
void AMSextruder::paintEvent(wxPaintEvent& evt)
|
||||
{
|
||||
wxPaintDC dc(this);
|
||||
|
|
@ -652,12 +732,12 @@ void AMSextruder::render(wxDC& dc)
|
|||
wxGCDC dc2(memdc);
|
||||
//doRender(dc2);
|
||||
}
|
||||
m_left_extruder->update(true);
|
||||
m_left_extruder->setShowState(true);
|
||||
if (m_nozzle_num >= 2) {
|
||||
m_right_extruder->update(true);
|
||||
m_right_extruder->setShowState(true);
|
||||
}
|
||||
else {
|
||||
m_right_extruder->update(false);
|
||||
m_right_extruder->setShowState(false);
|
||||
}
|
||||
memdc.SelectObject(wxNullBitmap);
|
||||
dc.DrawBitmap(bmp, 0, 0);
|
||||
|
|
@ -671,61 +751,14 @@ void AMSextruder::doRender(wxDC& dc)
|
|||
{
|
||||
//m_current_colur =
|
||||
wxSize size = GetSize();
|
||||
/*dc.SetPen(wxPen(AMS_CONTROL_GRAY500, 2, wxSOLID));
|
||||
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));*/
|
||||
|
||||
/*if (!m_none_ams_mode) {
|
||||
dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1);
|
||||
}*/
|
||||
/*if (m_has_vams) {
|
||||
dc.DrawRoundedRectangle(-size.x / 2, size.y * 0.1, size.x, size.y, 4);
|
||||
|
||||
if (m_vams_loading) {
|
||||
|
||||
if (m_current_colur.Alpha() == 0) { dc.SetPen(wxPen(*wxWHITE, 6, wxSOLID)); }
|
||||
else { dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); }
|
||||
dc.DrawRoundedRectangle(-size.x / 2, size.y * 0.1, size.x, size.y, 4);
|
||||
|
||||
if ((m_current_colur == *wxWHITE || m_current_colur.Alpha() == 0) && !wxGetApp().dark_mode()) {
|
||||
dc.SetPen(wxPen(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, 1, wxSOLID));
|
||||
dc.DrawRoundedRectangle(-size.x / 2 - FromDIP(3), size.y * 0.1 + FromDIP(3), size.x, size.y, 3);
|
||||
dc.DrawRoundedRectangle(-size.x / 2 + FromDIP(3), size.y * 0.1 - FromDIP(3), size.x, size.y, 5);
|
||||
}
|
||||
}
|
||||
|
||||
if (m_ams_loading && !m_none_ams_mode) {
|
||||
if (m_current_colur.Alpha() == 0) {dc.SetPen(wxPen(*wxWHITE, 6, wxSOLID));}
|
||||
else {dc.SetPen(wxPen(m_current_colur, 6, wxSOLID));}
|
||||
dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1);
|
||||
|
||||
if ((m_current_colur == *wxWHITE || m_current_colur.Alpha() == 0) && !wxGetApp().dark_mode()) {
|
||||
dc.SetPen(wxPen(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, 1, wxSOLID));
|
||||
dc.DrawLine(size.x / 2 - FromDIP(4), -1, size.x / 2 - FromDIP(3), size.y * 0.6 - 1);
|
||||
dc.DrawLine(size.x / 2 + FromDIP(3), -1, size.x / 2 + FromDIP(3), size.y * 0.6 - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (m_ams_loading) {
|
||||
if (m_current_colur.Alpha() == 0) { dc.SetPen(wxPen(*wxWHITE, 6, wxSOLID)); }
|
||||
else { dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); }
|
||||
dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1);
|
||||
|
||||
if ((m_current_colur == *wxWHITE || m_current_colur.Alpha() == 0) && !wxGetApp().dark_mode()) {
|
||||
dc.SetPen(wxPen(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, 1, wxSOLID));
|
||||
dc.DrawLine(size.x / 2 - FromDIP(4), -1, size.x / 2 - FromDIP(3), size.y * 0.6 - 1);
|
||||
dc.DrawLine(size.x / 2 + FromDIP(3), -1, size.x / 2 + FromDIP(3), size.y * 0.6 - 1);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
void AMSextruder::msw_rescale()
|
||||
{
|
||||
//m_amsSextruder->msw_rescale();
|
||||
m_left_extruder->msw_rescale();
|
||||
m_right_extruder->msw_rescale();
|
||||
if (m_left_extruder) m_left_extruder->msw_rescale();
|
||||
if (m_right_extruder) m_right_extruder->msw_rescale();
|
||||
Layout();
|
||||
Update();
|
||||
Refresh();
|
||||
|
|
@ -856,12 +889,15 @@ void AMSLib::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
|
|||
|
||||
m_bitmap_extra_tray_left = ScalableBitmap(this, "extra_ams_tray_left", 72);
|
||||
m_bitmap_extra_tray_right = ScalableBitmap(this, "extra_ams_tray_right", 72);
|
||||
m_bitmap_extra_tray_mid = ScalableBitmap(this, "extra_ams_tray_mid", 72);
|
||||
|
||||
m_bitmap_extra_tray_left_hover = ScalableBitmap(this, "extra_ams_tray_left_hover", 72);
|
||||
m_bitmap_extra_tray_right_hover = ScalableBitmap(this, "extra_ams_tray_right_hover", 72);
|
||||
m_bitmap_extra_tray_mid_hover = ScalableBitmap(this, "extra_ams_tray_mid_hover", 72);
|
||||
|
||||
m_bitmap_extra_tray_left_selected = ScalableBitmap(this, "extra_ams_tray_left_selected", 72);
|
||||
m_bitmap_extra_tray_right_selected = ScalableBitmap(this, "extra_ams_tray_right_selected", 72);
|
||||
m_bitmap_extra_tray_mid_selected = ScalableBitmap(this, "extra_ams_tray_mid_selected", 72);
|
||||
|
||||
|
||||
m_sizer_body->Add(0, 0, 1, wxEXPAND, 0);
|
||||
|
|
@ -950,14 +986,14 @@ void AMSLib::render(wxDC &dc)
|
|||
|
||||
// text
|
||||
if (m_ams_model == AMSModel::AMS_LITE || (m_ams_model == AMSModel::EXT_AMS && m_ext_type == AMSModelOriginType::LITE_EXT)) {
|
||||
render_extra_text(dc);
|
||||
render_lite_text(dc);
|
||||
}
|
||||
else{
|
||||
render_generic_text(dc);
|
||||
}
|
||||
}
|
||||
|
||||
void AMSLib::render_extra_text(wxDC& dc)
|
||||
void AMSLib::render_lite_text(wxDC& dc)
|
||||
{
|
||||
auto tmp_lib_colour = m_info.material_colour;
|
||||
|
||||
|
|
@ -1006,7 +1042,6 @@ void AMSLib::render_extra_text(wxDC& dc)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if (has_split) {
|
||||
dc.SetFont(::Label::Body_10);
|
||||
auto line_top = m_info.material_name.substr(0, m_info.material_name.find(has_split_char));
|
||||
|
|
@ -1168,7 +1203,7 @@ void AMSLib::render_generic_text(wxDC &dc)
|
|||
void AMSLib::doRender(wxDC &dc)
|
||||
{
|
||||
if (m_ams_model == AMSModel::AMS_LITE || m_ext_type == AMSModelOriginType::LITE_EXT) {
|
||||
render_extra_lib(dc);
|
||||
render_lite_lib(dc);
|
||||
}
|
||||
else {
|
||||
render_generic_lib(dc);
|
||||
|
|
@ -1176,13 +1211,21 @@ void AMSLib::doRender(wxDC &dc)
|
|||
//render_extra_lib(dc);
|
||||
}
|
||||
|
||||
void AMSLib::render_extra_lib(wxDC& dc)
|
||||
void AMSLib::render_lite_lib(wxDC& dc)
|
||||
{
|
||||
wxSize size = GetSize();
|
||||
auto libsize = AMS_LITE_CAN_LIB_SIZE;
|
||||
ScalableBitmap tray_bitmap = (m_can_index <= 1) ? m_bitmap_extra_tray_left : m_bitmap_extra_tray_right;
|
||||
ScalableBitmap tray_bitmap_hover = (m_can_index <= 1) ? m_bitmap_extra_tray_left_hover : m_bitmap_extra_tray_right_hover;
|
||||
ScalableBitmap tray_bitmap_selected = (m_can_index <= 1) ? m_bitmap_extra_tray_left_selected : m_bitmap_extra_tray_right_selected;
|
||||
ScalableBitmap tray_bitmap, tray_bitmap_hover, tray_bitmap_selected;
|
||||
if (m_ams_model == AMSModel::AMS_LITE){
|
||||
tray_bitmap = (m_can_index <= 1) ? m_bitmap_extra_tray_left : m_bitmap_extra_tray_right;
|
||||
tray_bitmap_hover = (m_can_index <= 1) ? m_bitmap_extra_tray_left_hover : m_bitmap_extra_tray_right_hover;
|
||||
tray_bitmap_selected = (m_can_index <= 1) ? m_bitmap_extra_tray_left_selected : m_bitmap_extra_tray_right_selected;
|
||||
}
|
||||
else{
|
||||
tray_bitmap = m_bitmap_extra_tray_mid;
|
||||
tray_bitmap_hover = m_bitmap_extra_tray_mid_hover;
|
||||
tray_bitmap_selected = m_bitmap_extra_tray_mid_selected;
|
||||
}
|
||||
|
||||
auto tmp_lib_colour = m_info.material_colour;
|
||||
change_the_opacity(tmp_lib_colour);
|
||||
|
|
@ -1210,8 +1253,7 @@ void AMSLib::render_extra_lib(wxDC& dc)
|
|||
//draw def background
|
||||
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
|
||||
dc.SetBrush(wxBrush(StateColor::darkModeColorFor(AMS_CONTROL_DEF_LIB_BK_COLOUR)));
|
||||
if (m_ams_model == AMSModel::EXT_AMS)
|
||||
{
|
||||
if (m_ams_model == AMSModel::EXT_AMS){
|
||||
dc.DrawRoundedRectangle(FromDIP(10), FromDIP(6), libsize.x - FromDIP(20), libsize.y - FromDIP(12), 0);
|
||||
}
|
||||
dc.DrawRoundedRectangle(FromDIP(10), FromDIP(10), libsize.x - FromDIP(20), libsize.y - FromDIP(20), 0);
|
||||
|
|
@ -1301,7 +1343,7 @@ void AMSLib::render_generic_lib(wxDC &dc)
|
|||
dc.SetBrush(wxBrush(AMS_CONTROL_DEF_LIB_BK_COLOUR));
|
||||
//dc.DrawRoundedRectangle(FromDIP(4), FromDIP(4), size.x - FromDIP(8), size.y - FromDIP(8), m_radius);
|
||||
//dc.DrawRoundedRectangle(FromDIP(4), FromDIP(4), size.x - FromDIP(8), size.y - FromDIP(m_radius - 2), m_radius);
|
||||
dc.DrawRoundedRectangle(FromDIP(2), FromDIP(2), FromDIP(size.x - 4), FromDIP(size.y - 3), m_radius);
|
||||
dc.DrawRoundedRectangle(FromDIP(2), FromDIP(2), size.x - FromDIP(4), size.y - FromDIP(3), m_radius);
|
||||
|
||||
if (tmp_lib_colour.GetLuminance() < 0.6) {
|
||||
temp_bitmap_third = m_bitmap_editable_light;
|
||||
|
|
@ -1428,7 +1470,7 @@ void AMSLib::render_generic_lib(wxDC &dc)
|
|||
}
|
||||
//gradient
|
||||
if (m_info.material_cols.size() > 1) {
|
||||
int left = FromDIP(2);
|
||||
auto left = FromDIP(2);
|
||||
float total_width = size.x - FromDIP(4);
|
||||
int gwidth = std::round(total_width / (m_info.material_cols.size() - 1));
|
||||
//gradient
|
||||
|
|
@ -1679,12 +1721,15 @@ void AMSLib::msw_rescale()
|
|||
|
||||
m_bitmap_extra_tray_left = ScalableBitmap(this, "extra_ams_tray_left", 72);
|
||||
m_bitmap_extra_tray_right = ScalableBitmap(this, "extra_ams_tray_right", 72);
|
||||
m_bitmap_extra_tray_mid = ScalableBitmap(this, "extra_ams_tray_mid", 72);
|
||||
|
||||
m_bitmap_extra_tray_left_hover = ScalableBitmap(this, "extra_ams_tray_left_hover", 72);
|
||||
m_bitmap_extra_tray_right_hover = ScalableBitmap(this, "extra_ams_tray_right_hover", 72);
|
||||
m_bitmap_extra_tray_mid_hover = ScalableBitmap(this, "extra_ams_tray_mid_hover", 72);
|
||||
|
||||
m_bitmap_extra_tray_left_selected = ScalableBitmap(this, "extra_ams_tray_left_selected", 72);
|
||||
m_bitmap_extra_tray_right_selected = ScalableBitmap(this, "extra_ams_tray_right_selected", 72);
|
||||
m_bitmap_extra_tray_mid_selected = ScalableBitmap(this, "extra_ams_tray_mid_selected", 72);
|
||||
|
||||
Layout();
|
||||
Refresh();
|
||||
|
|
@ -2005,7 +2050,7 @@ AMSRoadUpPart::AMSRoadUpPart(wxWindow* parent, wxWindowID id, AMSinfo info, AMSM
|
|||
|
||||
void AMSRoadUpPart::create(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size) {
|
||||
wxWindow::Create(parent, id, pos, size);
|
||||
//SetSize(size);
|
||||
SetSize(size);
|
||||
SetMinSize(size);
|
||||
SetBackgroundColour(AMS_CONTROL_WHITE_COLOUR);
|
||||
Layout();
|
||||
|
|
@ -2069,19 +2114,18 @@ void AMSRoadUpPart::doRender(wxDC& dc)
|
|||
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
|
||||
|
||||
if ((m_ams_model == N3S_AMS || m_ams_model == EXT_AMS) && m_amsinfo.cans.size() != 4){
|
||||
dc.DrawLine((size.x / 2), (0), (size.x / 2), (size.y));
|
||||
dc.DrawLine(((float)size.x / 2), (0), ((float)size.x / 2), (size.y));
|
||||
if (m_load_step == AMSPassRoadSTEP::AMS_ROAD_STEP_2 || m_load_step == AMSPassRoadSTEP::AMS_ROAD_STEP_3){
|
||||
dc.SetPen(wxPen(m_amsinfo.cans[m_load_slot_index].material_colour, 4, wxSOLID));
|
||||
dc.DrawLine((size.x / 2), (0), (size.x / 2), (size.y));
|
||||
}
|
||||
}
|
||||
else{
|
||||
int x_start = 0.15 * size.x;
|
||||
int x = x_start;
|
||||
int width = 0.24 * size.x;
|
||||
int height = size.y * 0.62;
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
auto x_start = FromDIP(40);
|
||||
auto x = x_start;
|
||||
auto width = FromDIP(63);
|
||||
auto height = FromDIP(21);
|
||||
for (int i = 0; i < 4; i++){
|
||||
dc.DrawLine((x), (0), (x), (height));
|
||||
x += width;
|
||||
}
|
||||
|
|
@ -2204,10 +2248,10 @@ void AMSRoadDownPart::OnVamsLoading(bool load, wxColour col /*= AMS_CONTROL_GRAY
|
|||
void AMSRoadDownPart::SetPassRoadColour(bool left, wxColour col)
|
||||
{
|
||||
if (left){
|
||||
m_road_color[1] = col;
|
||||
m_road_color[DEPUTY_NOZZLE_ID] = col;
|
||||
}
|
||||
else{
|
||||
m_road_color[0] = col;
|
||||
m_road_color[MAIN_NOZZLE_ID] = col;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2249,14 +2293,13 @@ void AMSRoadDownPart::render(wxDC& dc)
|
|||
void AMSRoadDownPart::doRender(wxDC& dc)
|
||||
{
|
||||
wxSize size = GetSize();
|
||||
wxPoint left_nozzle_pos = wxPoint((size.x / 2 - FromDIP(8)), FromDIP(258));
|
||||
wxPoint right_nozzle_pos = wxPoint((size.x / 2 + FromDIP(6)), FromDIP(258));
|
||||
wxPoint left_nozzle_pos = wxPoint(std::ceil((float)size.x / 2 - FromDIP(8)), FromDIP(258));
|
||||
wxPoint right_nozzle_pos = wxPoint(std::ceil((float)size.x / 2 + FromDIP(6)), FromDIP(258));
|
||||
/*if (m_road_color.Alpha() == 0) { dc.SetPen(wxPen(*wxWHITE, m_passroad_width, wxSOLID)); }
|
||||
else { dc.SetPen(wxPen(m_road_color, m_passroad_width, wxSOLID)); }*/
|
||||
dc.SetPen(wxPen(AMS_CONTROL_GRAY500, 2, wxSOLID));
|
||||
auto xpos = left_nozzle_pos.x;
|
||||
if (m_left_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_NONE || m_right_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_NONE)
|
||||
{
|
||||
if (m_left_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_NONE || m_right_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_NONE){
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(55), (size.y / 2), (left_nozzle_pos.x), (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(55), (0), left_nozzle_pos.x - FromDIP(55), (size.y / 2));
|
||||
}
|
||||
|
|
@ -2264,22 +2307,20 @@ void AMSRoadDownPart::doRender(wxDC& dc)
|
|||
switch (m_left_rode_mode)
|
||||
{
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_FOUR:
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP((134)), (size.y / 2), left_nozzle_pos.x, (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP((134)), 0, left_nozzle_pos.x - FromDIP((134)), (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP((129)), (size.y / 2), left_nozzle_pos.x, (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP((129)), 0, left_nozzle_pos.x - FromDIP((129)), (size.y / 2));
|
||||
break;
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_DOUBLE:
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(233), (size.y / 2), left_nozzle_pos.x, (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(115), 0, left_nozzle_pos.x - FromDIP(115), (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(223), 0, left_nozzle_pos.x - FromDIP(223), (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(218), (size.y / 2), left_nozzle_pos.x, (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(110), 0, left_nozzle_pos.x - FromDIP(110), (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(218), 0, left_nozzle_pos.x - FromDIP(218), (size.y / 2));
|
||||
break;
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_SINGLE:
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(197), (size.y / 2), left_nozzle_pos.x, (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(197), 0, left_nozzle_pos.x - FromDIP(197), (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(192), (size.y / 2), left_nozzle_pos.x, (size.y / 2));
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(192), 0, left_nozzle_pos.x - FromDIP(192), (size.y / 2));
|
||||
break;
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_EXTRA_AMS:
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(3), 0, left_nozzle_pos.x - FromDIP(3), size.y / 2);
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(3), size.y / 2, (left_nozzle_pos.x), size.y / 2);
|
||||
dc.DrawLine(left_nozzle_pos.x, size.y / 2, left_nozzle_pos.x, size.y);
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_AMS_LITE:
|
||||
dc.DrawLine(left_nozzle_pos.x, 0, left_nozzle_pos.x, size.y);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
@ -2288,22 +2329,22 @@ void AMSRoadDownPart::doRender(wxDC& dc)
|
|||
switch (m_right_rode_mode)
|
||||
{
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_FOUR:
|
||||
dc.DrawLine(right_nozzle_pos.x, (size.y / 2), right_nozzle_pos.x + FromDIP(136), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(136), 0, right_nozzle_pos.x + FromDIP(136), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x, (size.y / 2), right_nozzle_pos.x + FromDIP(131), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(131), 0, right_nozzle_pos.x + FromDIP(131), (size.y / 2));
|
||||
break;
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_DOUBLE:
|
||||
dc.DrawLine(right_nozzle_pos.x, (size.y / 2), right_nozzle_pos.x + FromDIP(223), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(115), 0, right_nozzle_pos.x + FromDIP(115), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(223), 0, right_nozzle_pos.x + FromDIP(223), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x, (size.y / 2), right_nozzle_pos.x + FromDIP(218), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(110), 0, right_nozzle_pos.x + FromDIP(110), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(218), 0, right_nozzle_pos.x + FromDIP(218), (size.y / 2));
|
||||
break;
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_SINGLE:
|
||||
dc.DrawLine(right_nozzle_pos.x, (size.y / 2), right_nozzle_pos.x + FromDIP(73), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(73), 0, right_nozzle_pos.x + FromDIP(73), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x, (size.y / 2), right_nozzle_pos.x + FromDIP(68), (size.y / 2));
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(68), 0, right_nozzle_pos.x + FromDIP(68), (size.y / 2));
|
||||
break;
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_EXTRA_AMS:
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(4), 0, right_nozzle_pos.x + FromDIP(4), size.y / 2);
|
||||
case AMSRoadShowMode::AMS_ROAD_MODE_AMS_LITE:
|
||||
dc.DrawLine(right_nozzle_pos.x, 0, right_nozzle_pos.x, size.y / 2);
|
||||
if (m_nozzle_num >= 2) xpos = right_nozzle_pos.x;
|
||||
dc.DrawLine(xpos, size.y / 2, right_nozzle_pos.x + FromDIP(4), size.y / 2);
|
||||
dc.DrawLine(xpos, size.y / 2, right_nozzle_pos.x, size.y / 2);
|
||||
dc.DrawLine(xpos, size.y / 2, xpos, size.y);
|
||||
break;
|
||||
default:
|
||||
|
|
@ -2311,7 +2352,7 @@ void AMSRoadDownPart::doRender(wxDC& dc)
|
|||
}
|
||||
}
|
||||
|
||||
if (m_right_rode_mode != AMSRoadShowMode::AMS_ROAD_MODE_EXTRA_AMS){
|
||||
if (m_right_rode_mode != AMSRoadShowMode::AMS_ROAD_MODE_AMS_LITE){
|
||||
if (m_nozzle_num == 2) {
|
||||
/*dc.DrawLine(FromDIP(left_nozzle_pos.x), FromDIP(size.y / 2), FromDIP(left_nozzle_pos.x), FromDIP(size.y));
|
||||
dc.DrawLine(FromDIP(right_nozzle_pos.x), FromDIP(size.y / 2), FromDIP(right_nozzle_pos.x), FromDIP(size.y));*/
|
||||
|
|
@ -2319,7 +2360,7 @@ void AMSRoadDownPart::doRender(wxDC& dc)
|
|||
dc.DrawLine((right_nozzle_pos.x), (size.y / 2), (right_nozzle_pos.x), (size.y));
|
||||
}
|
||||
else {
|
||||
if (m_right_rode_mode != AMSRoadShowMode::AMS_ROAD_MODE_NONE) {
|
||||
if (m_right_rode_mode != AMSRoadShowMode::AMS_ROAD_MODE_NONE && m_left_rode_mode != AMSRoadShowMode::AMS_ROAD_MODE_NONE) {
|
||||
dc.DrawLine((left_nozzle_pos.x), (size.y / 2), (right_nozzle_pos.x), (size.y / 2));
|
||||
}
|
||||
dc.DrawLine((left_nozzle_pos.x), (size.y / 2), (left_nozzle_pos.x), (size.y));
|
||||
|
|
@ -2336,11 +2377,11 @@ void AMSRoadDownPart::doRender(wxDC& dc)
|
|||
if (m_pass_road_right_step == AMSPassRoadSTEP::AMS_ROAD_STEP_2 || m_pass_road_right_step == AMSPassRoadSTEP::AMS_ROAD_STEP_3) {
|
||||
dc.SetPen(wxPen(m_road_color[0], 4, wxSOLID));
|
||||
if (m_right_road_length > 0) {
|
||||
if (m_right_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_EXTRA_AMS){
|
||||
dc.DrawLine(right_nozzle_pos.x + FromDIP(4), 0, right_nozzle_pos.x + FromDIP(4), size.y / 2);
|
||||
if (m_right_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_AMS_LITE){
|
||||
dc.DrawLine(right_nozzle_pos.x, 0, right_nozzle_pos.x, size.y / 2);
|
||||
xpos = left_nozzle_pos.x;
|
||||
if (m_nozzle_num >= 2) xpos = right_nozzle_pos.x;
|
||||
dc.DrawLine(xpos, size.y / 2, right_nozzle_pos.x + FromDIP(4), size.y / 2);
|
||||
dc.DrawLine(xpos, size.y / 2, right_nozzle_pos.x, size.y / 2);
|
||||
dc.DrawLine(xpos, size.y / 2, xpos, size.y);
|
||||
}
|
||||
else{
|
||||
|
|
@ -2360,10 +2401,8 @@ void AMSRoadDownPart::doRender(wxDC& dc)
|
|||
if (m_pass_road_left_step == AMSPassRoadSTEP::AMS_ROAD_STEP_2 || m_pass_road_left_step == AMSPassRoadSTEP::AMS_ROAD_STEP_3) {
|
||||
dc.SetPen(wxPen(m_road_color[1], 4, wxSOLID));
|
||||
if (m_left_road_length > 0) {
|
||||
if (m_left_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_EXTRA_AMS){
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(3), 0, (left_nozzle_pos.x - FromDIP(3)), size.y / 2);
|
||||
dc.DrawLine(left_nozzle_pos.x - FromDIP(3), size.y / 2, (left_nozzle_pos.x), size.y / 2);
|
||||
dc.DrawLine(left_nozzle_pos.x, size.y / 2, left_nozzle_pos.x, size.y);
|
||||
if (m_left_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_AMS_LITE){
|
||||
dc.DrawLine(left_nozzle_pos.x, 0, left_nozzle_pos.x, size.y);
|
||||
}
|
||||
else{
|
||||
dc.DrawLine((left_nozzle_pos.x - FromDIP(m_left_road_length)), (size.y / 2), (left_nozzle_pos.x), (size.y / 2));
|
||||
|
|
@ -2374,9 +2413,9 @@ void AMSRoadDownPart::doRender(wxDC& dc)
|
|||
}
|
||||
}
|
||||
|
||||
void AMSRoadDownPart::UpdatePassRoad(string can_id, bool left, int len, AMSinfo info, AMSPassRoadSTEP step) {
|
||||
void AMSRoadDownPart::UpdatePassRoad(string can_id, AMSPanelPos pos, int len, AMSPassRoadSTEP step) {
|
||||
if (m_nozzle_num >= 2){
|
||||
if (left){
|
||||
if (pos == AMSPanelPos::LEFT_PANEL){
|
||||
m_left_road_length = len;;
|
||||
m_pass_road_left_step = step;
|
||||
}
|
||||
|
|
@ -2386,7 +2425,7 @@ void AMSRoadDownPart::UpdatePassRoad(string can_id, bool left, int len, AMSinfo
|
|||
}
|
||||
}
|
||||
else{
|
||||
if (left) {
|
||||
if (pos == AMSPanelPos::LEFT_PANEL) {
|
||||
m_left_road_length = len;
|
||||
m_right_road_length = -1;
|
||||
m_pass_road_left_step = step;
|
||||
|
|
@ -2448,11 +2487,11 @@ void AMSPreview::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, con
|
|||
m_ts_bitmap_cube = ScalableBitmap(this, "ts_bitmap_cube", 14);
|
||||
m_four_slot_bitmap = ScalableBitmap(this, "four_slot_ams_item", 26);
|
||||
m_single_slot_bitmap = ScalableBitmap(this, "single_slot_ams_item", 26);
|
||||
m_ext_bitmap = ScalableBitmap(this, "ext_ams_item", 24);
|
||||
m_ext_bitmap = ScalableBitmap(this, "ext_ams_item", 26);
|
||||
wxWindow::Create(parent, id, pos, size);
|
||||
SetMinSize(size);
|
||||
SetMaxSize(size);
|
||||
//SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR);
|
||||
SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
|
||||
Refresh();
|
||||
}
|
||||
|
||||
|
|
@ -2518,8 +2557,8 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3);*/
|
||||
|
||||
//auto left = m_padding;
|
||||
auto left = size.x * 0.09;
|
||||
m_space = size.x * 0.21;
|
||||
auto left = FromDIP(8);
|
||||
m_space = FromDIP(9);
|
||||
auto color = *wxWHITE;
|
||||
//four slot
|
||||
if (m_ams_item_type != AMSModel::EXT_AMS && m_ams_item_type != AMSModel::N3S_AMS){
|
||||
|
|
@ -2535,7 +2574,6 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
else {
|
||||
dc.SetBrush(AMS_CONTROL_DISABLE_COLOUR);
|
||||
}
|
||||
|
||||
if (iter->material_cols.size() > 1) {
|
||||
int fleft = left;
|
||||
float total_width = AMS_ITEM_CUBE_SIZE.x;
|
||||
|
|
@ -2586,6 +2624,10 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
//single slot
|
||||
else {
|
||||
auto iter = m_amsinfo.cans[0];
|
||||
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
|
||||
dc.SetBrush(StateColor::darkModeColorFor(AMS_CONTROL_DEF_BLOCK_BK_COLOUR));
|
||||
wxSize rec_size = wxSize(FromDIP(16), FromDIP(24));
|
||||
dc.DrawRoundedRectangle((size.x - rec_size.x) / 2, (size.y - rec_size.y) / 2, rec_size.x, rec_size.y, FromDIP(2));
|
||||
if (iter.material_cols.size() > 1)
|
||||
{
|
||||
int fleft = (size.x - AMS_ITEM_CUBE_SIZE.x) / 2;
|
||||
|
|
@ -2616,17 +2658,10 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
}
|
||||
else {
|
||||
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
|
||||
if (iter.material_colour != ""){
|
||||
dc.SetBrush(iter.material_colour);
|
||||
//dc.SetBrush(*wxGREEN);
|
||||
auto rect = wxRect(((size.x - AMS_ITEM_CUBE_SIZE.x) / 2), ((size.y - AMS_ITEM_CUBE_SIZE.y) / 2), (AMS_ITEM_CUBE_SIZE.x - FromDIP(1)), (AMS_ITEM_CUBE_SIZE.y));
|
||||
dc.DrawRoundedRectangle(rect, 3);
|
||||
}
|
||||
if (iter.material_colour.Red() >= 238 && iter.material_colour.Green() >= 238 && iter.material_colour.Blue() >= 238) {
|
||||
dc.SetPen(wxPen(AMS_CONTROL_GRAY500));
|
||||
auto rect = wxRect((size.x - FromDIP(6)) / 2 - FromDIP(1), (size.y - FromDIP(12)) / 2 - FromDIP(1), AMS_ITEM_CUBE_SIZE.x - FromDIP(1), AMS_ITEM_CUBE_SIZE.y - FromDIP(1));
|
||||
dc.DrawRoundedRectangle(rect, 3);
|
||||
}
|
||||
dc.SetBrush(iter.material_colour);
|
||||
//dc.SetBrush(*wxGREEN);
|
||||
auto rect = wxRect(((size.x - AMS_ITEM_CUBE_SIZE.x) / 2), ((size.y - AMS_ITEM_CUBE_SIZE.y) / 2), (AMS_ITEM_CUBE_SIZE.x - FromDIP(1)), (AMS_ITEM_CUBE_SIZE.y));
|
||||
dc.DrawRoundedRectangle(rect, 3);
|
||||
}
|
||||
if (m_ams_item_type == AMSModel::N3S_AMS) {
|
||||
auto pot = wxPoint(((size.x - m_single_slot_bitmap.GetBmpSize().x) / 2), ((size.y - m_single_slot_bitmap.GetBmpSize().y) / 2));
|
||||
|
|
@ -2634,18 +2669,23 @@ void AMSPreview::doRender(wxDC &dc)
|
|||
}
|
||||
else {
|
||||
|
||||
auto pot = wxPoint((size.x - m_ext_bitmap.GetBmpSize().x) / 2, (size.y - m_ext_bitmap.GetBmpSize().y) / 2);
|
||||
dc.DrawBitmap(m_ext_bitmap.bmp(), pot);
|
||||
//auto pot = wxPoint((size.x - m_ext_bitmap.GetBmpSize().x) / 2, (size.y - m_ext_bitmap.GetBmpSize().y) / 2);
|
||||
//dc.DrawBitmap(m_ext_bitmap.bmp(), pot);
|
||||
|
||||
auto tsize = dc.GetMultiLineTextExtent(_L("Ext"));
|
||||
/*auto tsize = dc.GetMultiLineTextExtent(_L("Ext"));
|
||||
dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
|
||||
dc.SetFont(Label::Body_8);
|
||||
dc.SetTextForeground(AMS_CONTROL_BLACK_COLOUR);
|
||||
pot = wxPoint((size.x - tsize.x) / 2 + FromDIP(2), (size.y + FromDIP(12)) / 2 - FromDIP(2));
|
||||
dc.DrawText(_L("Ext"), pot);
|
||||
dc.DrawText(_L("Ext"), pot);*/
|
||||
}
|
||||
if ((iter.material_colour.Red() >= 238 && iter.material_colour.Green() >= 238 && iter.material_colour.Blue() >= 238) || iter.material_colour.Alpha() == 0) {
|
||||
dc.SetPen(wxPen(AMS_CONTROL_GRAY500));
|
||||
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
|
||||
auto rect = wxRect((size.x - FromDIP(6)) / 2 - FromDIP(1), (size.y - FromDIP(12)) / 2 - FromDIP(1), AMS_ITEM_CUBE_SIZE.x - FromDIP(1), AMS_ITEM_CUBE_SIZE.y - FromDIP(1));
|
||||
dc.DrawRoundedRectangle(rect, 3);
|
||||
}
|
||||
}
|
||||
|
||||
auto border_colour = AMS_CONTROL_BRAND_COLOUR;
|
||||
if (!wxWindow::IsEnabled()) { border_colour = AMS_CONTROL_DISABLE_COLOUR; }
|
||||
|
||||
|
|
@ -2668,7 +2708,7 @@ void AMSPreview::msw_rescale() {
|
|||
m_ts_bitmap_cube = ScalableBitmap(this, "ts_bitmap_cube", 14);
|
||||
m_four_slot_bitmap = ScalableBitmap(this, "four_slot_ams_item", 26);
|
||||
m_single_slot_bitmap = ScalableBitmap(this, "single_slot_ams_item", 26);
|
||||
m_ext_bitmap = ScalableBitmap(this, "ext_ams_item", 24);
|
||||
m_ext_bitmap = ScalableBitmap(this, "ext_ams_item", 26);
|
||||
|
||||
Layout();
|
||||
Refresh();
|
||||
|
|
@ -2782,6 +2822,9 @@ void AMSHumidity::doRender(wxDC& dc)
|
|||
if (wxGetApp().dark_mode()) {
|
||||
hum_idx += 5;
|
||||
}
|
||||
if (hum_idx >= ams_humidity_img.size() || hum_idx < 0){
|
||||
BOOST_LOG_TRIVIAL(trace) << "humidity error";
|
||||
}
|
||||
auto hum_img = ams_humidity_img[hum_idx];
|
||||
auto pot = wxPoint(FromDIP(5), ((size.y - hum_img.GetBmpSize().y) / 2));
|
||||
dc.DrawBitmap(hum_img.bmp(), pot);
|
||||
|
|
@ -2894,13 +2937,13 @@ void AmsItem::create(wxWindow *parent)
|
|||
//auto road_panel = new wxPanel(this, wxID_ANY);
|
||||
//road_panel->SetSize(AMS_CAN_ROAD_SIZE);
|
||||
//road_panel->SetMinSize(AMS_CAN_ROAD_SIZE);
|
||||
if (m_ams_model == AMSModel::GENERIC_AMS || m_ams_model == AMSModel::N3F_AMS){
|
||||
if (m_ams_model == AMSModel::GENERIC_AMS || m_ams_model == AMSModel::N3F_AMS || m_ams_model == AMSModel::N3S_AMS){
|
||||
m_humidity = new AMSHumidity(this, wxID_ANY, m_info);
|
||||
sizer_item->Add(m_humidity, 0, wxALIGN_CENTER_HORIZONTAL, 0);
|
||||
}
|
||||
else{
|
||||
if (m_ams_model == EXT_AMS){
|
||||
m_ext_image = new AMSExtImage(this, wxID_ANY);
|
||||
m_ext_image = new AMSExtImage(this, false, AMSPanelPos::RIGHT_PANEL);
|
||||
sizer_item->Add(m_ext_image, 0, wxALIGN_CENTER_HORIZONTAL, 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -2915,12 +2958,12 @@ void AmsItem::create(wxWindow *parent)
|
|||
else{
|
||||
sizer_can_extra = new wxGridSizer(2, 2, FromDIP(20), FromDIP(20));
|
||||
sizer_item = new wxBoxSizer(wxVERTICAL);
|
||||
if (m_info.cans.size() == 4){
|
||||
if (m_info.cans.size() == GENERIC_AMS_SLOT_NUM){
|
||||
AddLiteCan(m_info.cans[0], 0, sizer_can_extra);
|
||||
AddLiteCan(m_info.cans[3], 3, sizer_can_extra);
|
||||
AddLiteCan(m_info.cans[1], 1, sizer_can_extra);
|
||||
AddLiteCan(m_info.cans[2], 2, sizer_can_extra);
|
||||
m_can_count = 4;
|
||||
m_can_count = GENERIC_AMS_SLOT_NUM;
|
||||
}
|
||||
|
||||
sizer_item->Add(sizer_can_extra, 0, wxALIGN_CENTER_HORIZONTAL | wxALIGN_TOP, 0);
|
||||
|
|
@ -3097,17 +3140,17 @@ void AmsItem::Update(AMSinfo info)
|
|||
m_can_count = info.cans.size();
|
||||
|
||||
|
||||
for (auto refresh_it : m_can_refresh_list) {
|
||||
int i = 0;
|
||||
AMSrefresh *refresh = refresh_it.second;
|
||||
if (i < m_can_count) {
|
||||
refresh->Update(info.ams_id, info.cans[i]);
|
||||
refresh->Show();
|
||||
} else {
|
||||
refresh->Hide();
|
||||
}
|
||||
i++;
|
||||
}
|
||||
// for (auto refresh_it : m_can_refresh_list) {
|
||||
// int i = 0;
|
||||
// AMSrefresh *refresh = refresh_it.second;
|
||||
// if (i < m_can_count) {
|
||||
// refresh->Update(info.ams_id, info.cans[i]);
|
||||
// refresh->Show();
|
||||
// } else {
|
||||
// refresh->Hide();
|
||||
// }
|
||||
// i++;
|
||||
// }
|
||||
|
||||
for (int i = 0; i < m_can_count; i++) {
|
||||
auto it = m_can_refresh_list.find(std::to_string(i));
|
||||
|
|
@ -3368,12 +3411,12 @@ void AmsItem::doRender(wxDC& dc)
|
|||
// A1
|
||||
dc.SetPen(wxPen(AMS_CONTROL_GRAY500, 2, wxSOLID));
|
||||
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
|
||||
RenderExtraRoad(dc, size);
|
||||
RenderLiteRoad(dc, size);
|
||||
}
|
||||
}
|
||||
|
||||
void AmsItem::RenderExtraRoad(wxDC& dc, wxSize size) {
|
||||
auto end_top = size.x;
|
||||
void AmsItem::RenderLiteRoad(wxDC& dc, wxSize size) {
|
||||
auto end_top = size.x - FromDIP(3);
|
||||
if (m_panel_pos == AMSPanelPos::RIGHT_PANEL){
|
||||
end_top = 0;
|
||||
}
|
||||
|
|
@ -3417,7 +3460,7 @@ void AmsItem::RenderExtraRoad(wxDC& dc, wxSize size) {
|
|||
dc.SetPen(wxPen(AMS_CONTROL_GRAY500, 2, wxSOLID));
|
||||
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
|
||||
auto top = std::min(a1_top, a2_top);
|
||||
dc.DrawLine(end_top - FromDIP(1), top, end_top - FromDIP(1), size.y);
|
||||
dc.DrawLine(end_top, top, end_top, size.y);
|
||||
|
||||
|
||||
if (!m_road_canid.empty()) {
|
||||
|
|
@ -3430,25 +3473,25 @@ void AmsItem::RenderExtraRoad(wxDC& dc, wxSize size) {
|
|||
if (m_road_canid == "0") {
|
||||
dc.DrawLine(a1_left, FromDIP(30), a1_left, a1_top);
|
||||
dc.DrawLine(a1_left, a1_top, end_top, a1_top);
|
||||
dc.DrawLine(end_top - FromDIP(passroad_width - 3), a1_top, end_top - FromDIP(passroad_width - 3), size.y);
|
||||
dc.DrawLine(end_top, a1_top, end_top, size.y);
|
||||
}
|
||||
|
||||
if (m_road_canid == "3") {
|
||||
dc.DrawLine(a2_left, FromDIP(30), a2_left, a2_top);
|
||||
dc.DrawLine(a2_left, a2_top, end_top, a2_top);
|
||||
dc.DrawLine(end_top - FromDIP(passroad_width - 3), a2_top, end_top - FromDIP(passroad_width - 3), size.y);
|
||||
dc.DrawLine(end_top, a2_top, end_top, size.y);
|
||||
}
|
||||
|
||||
if (m_road_canid == "1") {
|
||||
dc.DrawLine(a3_left, FromDIP(160), a3_left, a3_top);
|
||||
dc.DrawLine(a3_left, a3_top, end_top, a3_top);
|
||||
dc.DrawLine(end_top - FromDIP(passroad_width - 3), a3_top, end_top - FromDIP(passroad_width - 3), size.y);
|
||||
dc.DrawLine(end_top, a3_top, end_top, size.y);
|
||||
}
|
||||
|
||||
if (m_road_canid == "2") {
|
||||
dc.DrawLine(a4_left, FromDIP(160), a4_left, a4_top);
|
||||
dc.DrawLine(a4_left, a4_top, end_top, a4_top);
|
||||
dc.DrawLine(end_top - FromDIP(passroad_width - 3), a4_top, end_top - FromDIP(passroad_width - 3), size.y);
|
||||
dc.DrawLine(end_top, a4_top, end_top, size.y);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ enum class AMSRoadShowMode : int {
|
|||
AMS_ROAD_MODE_FOUR,
|
||||
AMS_ROAD_MODE_DOUBLE,
|
||||
AMS_ROAD_MODE_SINGLE,
|
||||
AMS_ROAD_MODE_EXTRA_AMS,
|
||||
AMS_ROAD_MODE_AMS_LITE,
|
||||
AMS_ROAD_MODE_NONE
|
||||
};
|
||||
|
||||
|
|
@ -143,22 +143,30 @@ enum FilamentStepType {
|
|||
#define AMS_ITEM_CUBE_SIZE wxSize(FromDIP(8), FromDIP(14))
|
||||
#define AMS_PREVIEW_SIZE wxSize(FromDIP(82), FromDIP(27))
|
||||
#define AMS_ITEM_SIZE wxSize(FromDIP(78), FromDIP(184))
|
||||
#define AMS_ITEM_FOUR_SIZE wxSize(FromDIP(44), FromDIP(24))
|
||||
#define AMS_ITEM_SINGLE_SIZE wxSize(FromDIP(20), FromDIP(24))
|
||||
#define AMS_ITEM_FOUR_SIZE wxSize(FromDIP(52), FromDIP(32))
|
||||
#define AMS_ITEM_SINGLE_SIZE wxSize(FromDIP(28), FromDIP(32))
|
||||
#define AMS_ITEM_HUMIDITY_SIZE wxSize(FromDIP(120), FromDIP(27))
|
||||
#define AMS_CAN_LIB_SIZE wxSize(FromDIP(52), FromDIP(80))
|
||||
#define AMS_LITE_CAN_LIB_SIZE wxSize(FromDIP(49), FromDIP(72))
|
||||
#define AMS_CAN_ROAD_SIZE wxSize(FromDIP(264), FromDIP(50))
|
||||
#define AMS_ITEMS_PANEL_SIZE wxSize(FromDIP(264), FromDIP(27))
|
||||
#define AMS_ITEMS_PANEL_SIZE wxSize(FromDIP(264), FromDIP(44))
|
||||
//#define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(184))
|
||||
//#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196))
|
||||
#define AMS_STEP_SIZE wxSize(FromDIP(172), FromDIP(196))
|
||||
#define AMS_REFRESH_SIZE wxSize(FromDIP(25), FromDIP(25))
|
||||
#define AMS_EXTRUDER_SIZE wxSize(FromDIP(29), FromDIP(37))
|
||||
#define AMS_EXTRUDER_BITMAP_SIZE wxSize(FromDIP(13), FromDIP(37))
|
||||
#define AMS_EXTRUDER_DOUBLE_NOZZLE_BITMAP_SIZE wxSize(FromDIP(13), FromDIP(36))
|
||||
#define AMS_EXTRUDER_SINGLE_NOZZLE_BITMAP_SIZE wxSize(FromDIP(18), FromDIP(36))
|
||||
#define AMS_BODY_SIZE wxSize(FromDIP(36), FromDIP(55))
|
||||
#define AMS_DOWN_ROAD_SIZE wxSize(FromDIP(568), FromDIP(10))
|
||||
#define AMS_HUMIDITY_SIZE wxSize(FromDIP(93), FromDIP(26))
|
||||
#define AMS_PANEL_SIZE wxSize(FromDIP(264), FromDIP(150))
|
||||
|
||||
|
||||
|
||||
#define MAIN_NOZZLE_ID 0
|
||||
#define DEPUTY_NOZZLE_ID 1
|
||||
#define GENERIC_AMS_SLOT_NUM 4
|
||||
|
||||
struct Caninfo
|
||||
{
|
||||
|
|
@ -270,7 +278,7 @@ class AMSextruderImage: public wxWindow
|
|||
public:
|
||||
void OnAmsLoading(bool load, wxColour col);
|
||||
void TurnOff();
|
||||
void update(bool show_state) { m_show_state = show_state; };
|
||||
void setShowState(bool show_state) { m_show_state = show_state; };
|
||||
void msw_rescale();
|
||||
void paintEvent(wxPaintEvent &evt);
|
||||
|
||||
|
|
@ -281,27 +289,36 @@ public:
|
|||
string m_file_name;
|
||||
bool m_ams_loading{ false };
|
||||
void doRender(wxDC &dc);
|
||||
AMSextruderImage(wxWindow *parent, wxWindowID id, string file_name, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize);
|
||||
AMSextruderImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition);
|
||||
~AMSextruderImage();
|
||||
};
|
||||
|
||||
//AMSExtImage upon ext lib
|
||||
class AMSExtImage : public wxWindow
|
||||
{
|
||||
private:
|
||||
bool m_ext_show = true;
|
||||
bool m_single_flag = false;
|
||||
AMSPanelPos m_ext_pos;
|
||||
public:
|
||||
void msw_rescale();
|
||||
void paintEvent(wxPaintEvent& evt);
|
||||
void setShowState(bool show) { m_ext_show = show; };
|
||||
|
||||
void render(wxDC& dc);
|
||||
ScalableBitmap m_ams_ext;
|
||||
ScalableBitmap m_ams_ext_left;
|
||||
ScalableBitmap m_ams_ext_right;
|
||||
void doRender(wxDC& dc);
|
||||
AMSExtImage(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);
|
||||
AMSExtImage(wxWindow* parent, bool single_flag = false, AMSPanelPos ext_pos = AMSPanelPos::RIGHT_PANEL, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);
|
||||
~AMSExtImage();
|
||||
};
|
||||
|
||||
|
||||
class AMSextruder : public wxWindow
|
||||
{
|
||||
private:
|
||||
int m_nozzle_num{ 1 };
|
||||
public:
|
||||
void TurnOn(wxColour col);
|
||||
void TurnOff();
|
||||
|
|
@ -314,7 +331,7 @@ public:
|
|||
void msw_rescale();
|
||||
void has_ams(bool hams) {m_has_vams = hams; Refresh();};
|
||||
void no_ams_mode(bool mode) {m_none_ams_mode = mode; Refresh();};
|
||||
void update(int nozzle_num) { m_nozzle_num = nozzle_num; };
|
||||
void updateNozzleNum(int nozzle_num);
|
||||
|
||||
bool m_none_ams_mode{true};
|
||||
bool m_has_vams{false};
|
||||
|
|
@ -322,14 +339,13 @@ public:
|
|||
bool m_ams_loading{false};
|
||||
wxColour m_current_colur;
|
||||
wxColour m_current_colur_deputy;
|
||||
int m_nozzle_num{ 1 };
|
||||
|
||||
wxBoxSizer * m_bitmap_sizer{nullptr};
|
||||
wxPanel * m_bitmap_panel{nullptr};
|
||||
//AMSextruderImage *m_amsSextruder{nullptr};
|
||||
AMSextruderImage* m_left_extruder;
|
||||
AMSextruderImage* m_right_extruder;
|
||||
AMSextruder(wxWindow *parent, wxWindowID id, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize);
|
||||
AMSextruderImage* m_left_extruder = nullptr;
|
||||
AMSextruderImage* m_right_extruder = nullptr;
|
||||
AMSextruder(wxWindow *parent, wxWindowID id, int nozzle_num, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize);
|
||||
~AMSextruder();
|
||||
};
|
||||
|
||||
|
|
@ -402,12 +418,15 @@ protected:
|
|||
|
||||
ScalableBitmap m_bitmap_extra_tray_left;
|
||||
ScalableBitmap m_bitmap_extra_tray_right;
|
||||
ScalableBitmap m_bitmap_extra_tray_mid;
|
||||
|
||||
ScalableBitmap m_bitmap_extra_tray_left_hover;
|
||||
ScalableBitmap m_bitmap_extra_tray_right_hover;
|
||||
ScalableBitmap m_bitmap_extra_tray_mid_hover;
|
||||
|
||||
ScalableBitmap m_bitmap_extra_tray_left_selected;
|
||||
ScalableBitmap m_bitmap_extra_tray_right_selected;
|
||||
ScalableBitmap m_bitmap_extra_tray_mid_selected;
|
||||
|
||||
bool m_unable_selected = {false};
|
||||
bool m_enable = {false};
|
||||
|
|
@ -429,10 +448,10 @@ protected:
|
|||
void on_left_down(wxMouseEvent &evt);
|
||||
void paintEvent(wxPaintEvent &evt);
|
||||
void render(wxDC &dc);
|
||||
void render_extra_text(wxDC& dc);
|
||||
void render_lite_text(wxDC& dc);
|
||||
void render_generic_text(wxDC& dc);
|
||||
void doRender(wxDC& dc);
|
||||
void render_extra_lib(wxDC& dc);
|
||||
void render_lite_lib(wxDC& dc);
|
||||
void render_generic_lib(wxDC& dc);
|
||||
};
|
||||
|
||||
|
|
@ -566,7 +585,7 @@ public:
|
|||
void OnVamsLoading(bool load, wxColour col = AMS_CONTROL_GRAY500);
|
||||
void SetPassRoadColour(bool left, wxColour col);
|
||||
void SetShowMode(AMSRoadShowMode left_mode, AMSRoadShowMode right_mode);
|
||||
void UpdatePassRoad(string can_id, bool left, int len, AMSinfo info, AMSPassRoadSTEP step);
|
||||
void UpdatePassRoad(string can_id, AMSPanelPos pos, int len, AMSPassRoadSTEP step);
|
||||
|
||||
void paintEvent(wxPaintEvent& evt);
|
||||
void render(wxDC& dc);
|
||||
|
|
@ -603,8 +622,8 @@ public:
|
|||
protected:
|
||||
wxSize m_cube_size;
|
||||
wxColour m_background_colour = { AMS_CONTROL_DEF_LIB_BK_COLOUR };
|
||||
float m_padding = { 4.0 };
|
||||
float m_space = { 9.4 };
|
||||
float m_padding;
|
||||
float m_space;
|
||||
bool m_hover = {false};
|
||||
bool m_selected = {false};
|
||||
AMSModel m_ams_item_type = AMSModel::GENERIC_AMS;
|
||||
|
|
@ -680,7 +699,7 @@ public:
|
|||
void paintEvent(wxPaintEvent& evt);
|
||||
void render(wxDC& dc);
|
||||
void doRender(wxDC& dc);
|
||||
void RenderExtraRoad(wxDC& dc, wxSize size);
|
||||
void RenderLiteRoad(wxDC& dc, wxSize size);
|
||||
wxColour GetTagColr(wxString canid);
|
||||
std::string GetCurrentCan();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue