3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 08:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ENH: enable gcode window and support viewing added custom gcode

Browse source 
Change-Id: I2def8c32c17b6f2edfd2e6d0776123127560f167
This commit is contained in:
liz.li 2023-03-16 14:44:04 +08:00 • committed by Lane.Wei
parent e2f96590cf
commit d776c7595e
12 changed files with 195 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/slic3r/GUI/IMSlider.hpp
View file

@ -51,7 +51,6 @@ enum LabelType
ltEstimatedTime,
};
class IMSlider
{
public:
@ -134,16 +133,20 @@ public:
protected:
void add_custom_gcode(std::string custom_gcode);
void add_code_as_tick(Type type, int selected_extruder = -1);
void do_go_to_layer(size_t layer_number);
void delete_tick(const TickCode& tick);
void do_go_to_layer(size_t layer_number); //menu
void correct_lower_value();
void correct_higher_value();
bool horizontal_slider(const char* str_id, int* v, int v_min, int v_max, const ImVec2& size, float scale = 1.0);
void render_go_to_layer_dialog();
void render_input_custom_gcode();
void render_go_to_layer_dialog(); //menu
void render_input_custom_gcode(std::string custom_gcode = ""); //menu
void render_menu();
void render_add_menu(); //menu
void render_edit_menu(const TickCode& tick); //menu
void draw_background_and_groove(const ImRect& bg_rect, const ImRect& groove);
void draw_colored_band(const ImRect& groove, const ImRect& slideable_region);
void draw_ticks(const ImRect& slideable_region);
void show_tooltip(const TickCode& tick); //menu
bool vertical_slider(const char* str_id, int* higher_value, int* lower_value,
std::string& higher_label, std::string& lower_label,
int v_min, int v_max, const ImVec2& size,
@ -176,22 +179,14 @@ private:
bool m_render_as_disabled{ false };
SelectedSlider m_selection;
bool m_is_left_down = false;
bool m_is_right_down = false;
bool m_is_one_layer = false;
bool m_is_focused = false;
bool m_show_menu = false;
bool m_menu_enable = true;
bool m_show_custom_gcode_window = false;
bool m_show_go_to_layer_dialog = false;
bool m_menu_enable = true; //menu
bool m_show_menu = false; //menu
bool m_show_custom_gcode_window = false; //menu
bool m_show_go_to_layer_dialog = false; //menu
bool m_force_mode_apply = true;
bool m_enable_action_icon = true;
bool m_enable_cog_icon = false;
bool m_is_wipe_tower = false; // This flag indicates that there is multiple extruder print with wipe tower
bool m_is_spiral_vase = false;
bool m_display_lower = true;
bool m_display_higher = true;
int m_selected_tick_value = -1;
/* BBS slider images */
void *m_one_layer_on_id;
@ -207,6 +202,7 @@ private:
void* m_one_layer_off_dark_id;
void* m_one_layer_off_hover_dark_id;
void *m_pause_icon_id;
void *m_custom_icon_id;
void *m_delete_icon_id;
DrawMode m_draw_mode = dmRegular;
@ -230,8 +226,8 @@ private:
std::vector<double> m_alternate_values;
char m_custom_gcode[1024] = { 0 };
char m_layer_number[64] = { 0 };
char m_custom_gcode[1024] = { 0 }; //menu
char m_layer_number[64] = { 0 }; //menu
};
}