pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced this->m_xxx with just m_xxx

Browse Source
This commit is contained in:
bubnikv
2018-09-10 09:11:49 +02:00
parent fca7c8abfe
commit 49697ed6aa
10 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/slic3r/GUI/BackgroundSlicingProcess.cpp
View File

@@ -131,7 +131,7 @@ bool BackgroundSlicingProcess::stop()
bool BackgroundSlicingProcess::apply_config(const DynamicPrintConfig &config)
{
this->stop();
bool invalidated = this->m_print->apply_config(config);
bool invalidated = m_print->apply_config(config);
return invalidated;
}

6
xs/src/slic3r/GUI/OptionsGroup.cpp
View File

@@ -66,12 +66,12 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co
field->m_on_change = [this](std::string opt_id, boost::any value){
//! This function will be called from Field.
//! Call OptionGroup._on_change(...)
if (!this->m_disabled)
if (!m_disabled)
this->on_change_OG(opt_id, value);
};
field->m_on_kill_focus = [this](){
//! This function will be called from Field.
if (!this->m_disabled)
if (!m_disabled)
this->on_kill_focus();
};
field->m_parent = parent();
@@ -79,7 +79,7 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co
//! Label to change background color, when option is modified
field->m_Label = label;
field->m_back_to_initial_value = [this](std::string opt_id){
if (!this->m_disabled)
if (!m_disabled)
this->back_to_initial_value(opt_id);
};
if (!m_is_tab_opt) field->m_Undo_btn->Hide();

16
xs/src/slic3r/GUI/Preset.cpp
View File

@@ -399,10 +399,10 @@ Preset* PresetCollection::find_preset(const std::string &name, bool first_visibl
size_t PresetCollection::first_visible_idx() const
{
size_t idx = m_default_suppressed ? 1 : 0;
for (; idx < this->m_presets.size(); ++ idx)
for (; idx < m_presets.size(); ++ idx)
if (m_presets[idx].is_visible)
break;
if (idx == this->m_presets.size())
if (idx == m_presets.size())
idx = 0;
return idx;
}
@@ -411,10 +411,10 @@ size_t PresetCollection::first_visible_idx() const
size_t PresetCollection::first_compatible_idx() const
{
size_t idx = m_default_suppressed ? 1 : 0;
for (; idx < this->m_presets.size(); ++ idx)
for (; idx < m_presets.size(); ++ idx)
if (m_presets[idx].is_compatible)
break;
if (idx == this->m_presets.size())
if (idx == m_presets.size())
idx = 0;
return idx;
}
@@ -465,8 +465,8 @@ void PresetCollection::update_platter_ui(wxBitmapComboBox *ui)
// Otherwise fill in the list from scratch.
ui->Freeze();
ui->Clear();
for (size_t i = this->m_presets.front().is_visible ? 0 : 1; i < this->m_presets.size(); ++ i) {
const Preset &preset = this->m_presets[i];
for (size_t i = m_presets.front().is_visible ? 0 : 1; i < m_presets.size(); ++ i) {
const Preset &preset = m_presets[i];
if (! preset.is_visible || (! preset.is_compatible && i != m_idx_selected))
continue;
const wxBitmap *bmp = (i == 0 || preset.is_compatible) ? m_bitmap_main_frame : m_bitmap_incompatible;
@@ -484,8 +484,8 @@ void PresetCollection::update_tab_ui(wxBitmapComboBox *ui, bool show_incompatibl
return;
ui->Freeze();
ui->Clear();
for (size_t i = this->m_presets.front().is_visible ? 0 : 1; i < this->m_presets.size(); ++ i) {
const Preset &preset = this->m_presets[i];
for (size_t i = m_presets.front().is_visible ? 0 : 1; i < m_presets.size(); ++ i) {
const Preset &preset = m_presets[i];
if (! preset.is_visible || (! show_incompatible && ! preset.is_compatible && i != m_idx_selected))
continue;
const wxBitmap *bmp = preset.is_compatible ? m_bitmap_compatible : m_bitmap_incompatible;

2
xs/src/slic3r/GUI/Preset.hpp
View File

@@ -181,7 +181,7 @@ public:
const Preset& first_compatible() const { return this->preset(this->first_compatible_idx()); }
// Return number of presets including the "- default -" preset.
size_t size() const { return this->m_presets.size(); }
size_t size() const { return m_presets.size(); }
// For Print / Filament presets, disable those, which are not compatible with the printer.
void update_compatible_with_printer(const Preset &active_printer, bool select_other_if_incompatible);