3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-23 00:31:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merged with master

Browse source
This commit is contained in:
bubnikv 2018-09-17 10:38:14 +02:00
commit 38028187b4
70 changed files with 1711 additions and 1163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/xsp/AppController.xsp
View file

@ -23,7 +23,7 @@
PrintController *print_ctl();
void set_model(Model *model);
void set_print(Print *print);
void set_global_progress_indicator(ProgressStatusBar *prs);
void set_global_progress_indicator(unsigned gauge_id, unsigned statusbar_id);
void arrange_model();
};

5
xs/xsp/GUI.xsp
View file

@ -186,3 +186,8 @@ void reset_double_slider()
void enable_action_buttons(bool enable)
%code%{ Slic3r::GUI::enable_action_buttons(enable); %};
void save_window_size(SV *window, std::string name)
%code%{ Slic3r::GUI::save_window_size((wxTopLevelWindow*)wxPli_sv_2_object(aTHX_ window, "Wx::TopLevelWindow"), name); %};
void restore_window_size(SV *window, std::string name)
%code%{ Slic3r::GUI::restore_window_size((wxTopLevelWindow*)wxPli_sv_2_object(aTHX_ window, "Wx::TopLevelWindow"), name); %};

2
xs/xsp/Layer.xsp
View file

@ -17,8 +17,6 @@
%code%{ RETVAL = &THIS->thin_fills; %};
Ref<SurfaceCollection> fill_surfaces()
%code%{ RETVAL = &THIS->fill_surfaces; %};
Ref<SurfaceCollection> perimeter_surfaces()
%code%{ RETVAL = &THIS->perimeter_surfaces; %};
Polygons bridged()
%code%{ RETVAL = THIS->bridged; %};
Ref<PolylineCollection> unsupported_bridge_edges()

14
xs/xsp/Model.xsp
View file

@ -340,9 +340,19 @@ ModelMaterial::attributes()
%code%{ RETVAL = &THIS->mesh; %};
bool modifier()
%code%{ RETVAL = THIS->modifier; %};
%code%{ RETVAL = THIS->is_modifier(); %};
void set_modifier(bool modifier)
%code%{ THIS->modifier = modifier; %};
%code%{ THIS->set_type(modifier ? ModelVolume::PARAMETER_MODIFIER : ModelVolume::MODEL_PART); %};
bool model_part()
%code%{ RETVAL = THIS->is_model_part(); %};
bool support_enforcer()
%code%{ RETVAL = THIS->is_support_enforcer(); %};
void set_support_enforcer()
%code%{ THIS->set_type(ModelVolume::SUPPORT_ENFORCER); %};
bool support_blocker()
%code%{ RETVAL = THIS->is_support_blocker(); %};
void set_support_blocker()
%code%{ THIS->set_type(ModelVolume::SUPPORT_BLOCKER); %};
size_t split(unsigned int max_extruders);

30
xs/xsp/Print.xsp
View file

@ -267,6 +267,36 @@ Print::total_cost(...)
THIS->total_cost = (double)SvNV(ST(1));
}
RETVAL = THIS->total_cost;
OUTPUT:
RETVAL
double
Print::total_wipe_tower_cost(...)
CODE:
if (items > 1) {
THIS->total_wipe_tower_cost = (double)SvNV(ST(1));
}
RETVAL = THIS->total_wipe_tower_cost;
OUTPUT:
RETVAL
double
Print::total_wipe_tower_filament(...)
CODE:
if (items > 1) {
THIS->total_wipe_tower_filament = (double)SvNV(ST(1));
}
RETVAL = THIS->total_wipe_tower_filament;
OUTPUT:
RETVAL
int
Print::m_wipe_tower_number_of_toolchanges(...)
CODE:
if (items > 1) {
THIS->m_wipe_tower_number_of_toolchanges = (double)SvNV(ST(1));
}
RETVAL = THIS->m_wipe_tower_number_of_toolchanges;
OUTPUT:
RETVAL
%}

5
xs/xsp/XS.xsp
View file

@ -48,6 +48,11 @@ trace(level, message)
CODE:
Slic3r::trace(level, message);
void
disable_multi_threading()
CODE:
Slic3r::disable_multi_threading();
void
set_var_dir(dir)
char *dir;