juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-10 17:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: preserve iXex tool assignments across gantry count changes

Browse Source 
- Add all_tool_states map to IXexModesCtrl Row, storing all tool
  assignments including those not currently visible due to grid size
- active_tools_string() now serializes from all_tool_states so
  off-screen assignments survive the round trip through a smaller grid
- Button clicks keep all_tool_states in sync with visible btn_states
- Display anchors to the gantry row containing the Primary assignment
  so reducing gantry count keeps the meaningful row visible rather
  than always defaulting to row 0

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Clifford Garwood
2026-04-08 23:35:32 -04:00
co-authored by Claude Sonnet 4.6
parent 48b9e6ab26
commit f540cf87a8
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/Tab.cpp
+26 -3
View File
@@ -4519,6 +4519,9 @@ private:
std::vector<int> btn_states; // parallel to btns
// tool_idx for btns[i]: computed during add_row, stored here for quick lookup
std::vector<int> btn_tool_idx;
// Full assignment map including tools not currently visible due to grid size.
// Preserved across grid resizes so assignments restore when grid expands again.
std::map<int,int> all_tool_states;
};
void add_row(const std::string& name = "",
@@ -4536,6 +4539,7 @@ private:
auto* grid_sizer = new wxGridSizer(m_n_rows, m_n_cols, 2, 2);
auto tool_states = parse_tool_states(active_tools);
r.all_tool_states = tool_states; // preserve all assignments, including off-screen tools
wxPanel* this_panel = r.panel;
// Buttons rendered top=rear (high Y), bottom=front (low Y).
@@ -4545,11 +4549,21 @@ private:
// Display iterates: row from n_rows-1 down to 0 (rear→front = top→bottom).
// raw_row = flip_y ? (n_rows-1-row) : row
// raw_col = flip_x ? (n_cols-1-col) : col
//
// row_start: anchor displayed rows to the gantry row containing the Primary
// assignment, so reducing gantry count keeps the meaningful row visible.
int primary_gantry_row = 0;
for (const auto& [idx, state] : tool_states) {
if (state == 1) { primary_gantry_row = idx / m_n_cols; break; }
}
int row_start = primary_gantry_row; // display rows [row_start .. row_start+m_n_rows-1]
bool flip_x = (m_layout == 1 || m_layout == 3);
bool flip_y = (m_layout == 2 || m_layout == 3);
for (int row = m_n_rows - 1; row >= 0; --row) {
for (int col = 0; col < m_n_cols; ++col) {
int raw_row = flip_y ? (m_n_rows - 1 - row) : row;
raw_row += row_start; // anchor to Primary's gantry row
int raw_col = flip_x ? (m_n_cols - 1 - col) : col;
int tool_idx = raw_row * m_n_cols + raw_col;
int state = 0;
@@ -4581,6 +4595,13 @@ private:
if (st == 1 && other_primary)
st = 2; // skip Primary → go straight to Copy
// Keep all_tool_states in sync so off-screen tools are preserved
int tidx = row_ref.btn_tool_idx[btn_pos];
if (st == 0)
row_ref.all_tool_states.erase(tidx);
else
row_ref.all_tool_states[tidx] = st;
apply_btn(row_ref.btns[btn_pos], row_ref.btn_tool_idx[btn_pos], st);
notify();
break;
@@ -4635,11 +4656,13 @@ private:
}
std::string active_tools_string(const Row& r) const {
// Serialize from all_tool_states (not just visible buttons) so assignments
// for off-screen tools are preserved across grid size changes.
std::string s;
for (size_t i = 0; i < r.btn_states.size(); ++i) {
if (r.btn_states[i] == 0) continue;
for (const auto& [idx, state] : r.all_tool_states) {
if (state == 0) continue;
if (!s.empty()) s += ',';
s += std::to_string(r.btn_tool_idx[i]) + ':' + state_role(r.btn_states[i]);
s += std::to_string(idx) + ':' + state_role(state);
}
return s;
}