mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-20 07:11:12 -06:00 
			
		
		
		
	ENH: refine calibration UI layout
1. adjust layout of every cali page 2. add tips panel about how to use PA result factor 3. modify PA start page text Change-Id: I5e9d4f9ab63e231289ac2b0db5efee158ddee7f5
This commit is contained in:
		
							parent
							
								
									d53d03f1fc
								
							
						
					
					
						commit
						53787b4c9e
					
				
					 14 changed files with 308 additions and 120 deletions
				
			
		|  | @ -16,6 +16,7 @@ | |||
| namespace Slic3r { namespace GUI { | ||||
| 
 | ||||
| 
 | ||||
| #define MIN_CALIBRATION_PAGE_WIDTH         FromDIP(1100) | ||||
| #define PRESET_GAP                         FromDIP(25) | ||||
| #define CALIBRATION_COMBOX_SIZE            wxSize(FromDIP(500), FromDIP(24)) | ||||
| #define CALIBRATION_FILAMENT_COMBOX_SIZE   wxSize(FromDIP(250), FromDIP(24)) | ||||
|  | @ -156,6 +157,39 @@ protected: | |||
|     std::vector<wxStaticText*> m_text_steps; | ||||
| }; | ||||
| 
 | ||||
| class CaliPagePicture : public wxPanel  | ||||
| { | ||||
| public: | ||||
|     CaliPagePicture(wxWindow* parent, | ||||
|         wxWindowID id = wxID_ANY, | ||||
|         const wxPoint& pos = wxDefaultPosition, | ||||
|         const wxSize& size = wxDefaultSize, | ||||
|         long style = wxTAB_TRAVERSAL); | ||||
| 
 | ||||
|     void set_img(const wxBitmap& bmp); | ||||
|     void paint_on_img(); | ||||
| protected: | ||||
|     wxStaticBitmap* m_img; | ||||
| }; | ||||
| 
 | ||||
| class PAPageHelpPanel : public wxPanel | ||||
| { | ||||
| public: | ||||
|     PAPageHelpPanel(wxWindow* parent, | ||||
|         bool ground_panel = true, | ||||
|         wxWindowID id = wxID_ANY, | ||||
|         const wxPoint& pos = wxDefaultPosition, | ||||
|         const wxSize& size = wxDefaultSize, | ||||
|         long style = wxTAB_TRAVERSAL); | ||||
|      | ||||
| protected: | ||||
|     void create_pop_window(); | ||||
| 
 | ||||
|     ScalableButton* m_help_btn; | ||||
|     PopupWindow* m_pop_win; | ||||
|     wxStaticBitmap* m_img; | ||||
| }; | ||||
| 
 | ||||
| enum class CaliPageActionType : int | ||||
| { | ||||
|     CALI_ACTION_MANAGE_RESULT = 0, | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 liz.li
						liz.li