Skip to content

Add Bulk Edit Rotate X / Y / Z to the Layout tab #6184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derwin12 merged 6 commits into from
May 20, 2026
Merged

Add Bulk Edit Rotate X / Y / Z to the Layout tab #6184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2844299
Add Bulk Edit Rotate X / Y / Z to Layout tab
Apr 20, 2026
192cc58
Add undo support to Bulk Edit Rotate X/Y/Z
Apr 20, 2026
c42e10b
Fix selection box orientation after bulk rotate
Apr 20, 2026
fde440d
Address Copilot feedback: filter editable models before undo snapshot
Apr 20, 2026
7c5d2b4
Validate rotation input and pass real model name to undo
Apr 20, 2026
9543049
Clean up comments in BulkEditRotateAxis function
derwin12 May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions src-ui-wx/layout/LayoutPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <wx/tglbtn.h>
#include <wx/srchctrl.h>
#include <pugixml.hpp>
#include <cmath>
#include <fstream>
#include <functional>
#include <spdlog/fmt/fmt.h>
Expand Down Expand Up @@ -394,6 +395,9 @@ const long LayoutPanel::ID_PREVIEW_BULKEDIT_CONTROLLERCONNECTIONINCREMENT = wxNe
const long LayoutPanel::ID_PREVIEW_BULKEDIT_SMARTREMOTETYPE = wxNewId();
const long LayoutPanel::ID_PREVIEW_BULKEDIT_PREVIEW = wxNewId();
const long LayoutPanel::ID_PREVIEW_BULKEDIT_DIMMINGCURVES = wxNewId();
const long LayoutPanel::ID_PREVIEW_BULKEDIT_ROTATEX = wxNewId();
const long LayoutPanel::ID_PREVIEW_BULKEDIT_ROTATEY = wxNewId();
const long LayoutPanel::ID_PREVIEW_BULKEDIT_ROTATEZ = wxNewId();
const long LayoutPanel::ID_PREVIEW_ALIGN_TOP = wxNewId();
const long LayoutPanel::ID_PREVIEW_ALIGN_GROUND = wxNewId();
const long LayoutPanel::ID_PREVIEW_ALIGN_BOTTOM = wxNewId();
Expand Down Expand Up @@ -2265,6 +2269,84 @@ void LayoutPanel::BulkEditPixelSize() {
}
}

void LayoutPanel::BulkEditRotateX() { BulkEditRotateAxis('X'); }
void LayoutPanel::BulkEditRotateY() { BulkEditRotateAxis('Y'); }
void LayoutPanel::BulkEditRotateZ() { BulkEditRotateAxis('Z'); }

void LayoutPanel::BulkEditRotateAxis(char axis) {
std::vector<Model*> modelsToEdit = GetSelectedModelsForEdit();

std::vector<Model*> editableModels;
editableModels.reserve(modelsToEdit.size());
for (Model* model : modelsToEdit) {
if (model != nullptr && !model->GetBaseObjectScreenLocation().IsLocked()) {
editableModels.push_back(model);
}
}
if (editableModels.empty()) {
return;
}
Comment on lines +2276 to +2288

// Pre-fill the dialog with the first editable model's current rotation so
// the user only has to type a value if they want to change it.
float initial = 0.0f;
switch (axis) {
case 'X': initial = editableModels.front()->GetBaseObjectScreenLocation().GetRotateX(); break;
case 'Y': initial = editableModels.front()->GetBaseObjectScreenLocation().GetRotateY(); break;
case 'Z': initial = editableModels.front()->GetBaseObjectScreenLocation().GetRotateZ(); break;
}

wxString title = wxString::Format("Bulk Edit Rotate %c", axis);
wxString prompt = wxString::Format("Rotate %c (degrees):", axis);
wxTextEntryDialog dlg(this, prompt, title, wxString::Format("%g", initial));
OptimiseDialogPosition(&dlg);
if (dlg.ShowModal() != wxID_OK) {
return;
}

// Parse the entered angle. Use strtod (not std::stod) because xLights has
// effectively no exception handling - see CLAUDE.md "Prefer std::* Over wx*".
std::string entered = dlg.GetValue().ToStdString();
char* endp = nullptr;
double angle = std::strtod(entered.c_str(), &endp);
if (endp == entered.c_str() || !std::isfinite(angle)) {
// Unparseable or NaN/Inf - abort silently rather than letting garbage
// propagate into transform matrices.
return;
}
Comment on lines +2309 to +2316
// Match the [-180, 180] range enforced by the rotation property grid
// (see ScreenLocationPropertyHelper.cpp RotateX/Y/Z Min/Max). Out-of-range
// values are silently reset to 0 by BoxedScreenLocation::Init(), so reject
// them here with a clear message rather than letting the user lose their
// change without warning.
if (angle < -180.0 || angle > 180.0) {
wxMessageBox(
wxString::Format("Rotation angle must be between -180 and 180 degrees (got %g).", angle),
"Invalid rotation angle", wxOK | wxICON_WARNING, this);
return;
}
Comment thread
heffneil marked this conversation as resolved.
float newAngle = static_cast<float>(angle);

CreateUndoPoint("All", editableModels.front()->name,
wxString::Format("BulkRotate%c", axis).ToStdString(),
entered);

for (Model* model : editableModels) {
auto& loc = model->GetBaseObjectScreenLocation();
switch (axis) {
case 'X': loc.SetRotateX(newAngle); break;
case 'Y': loc.SetRotateY(newAngle); break;
case 'Z': loc.SetRotateZ(newAngle); break;
}
loc.Reload();
loc.Init();
}

xlights->GetOutputModelManager()->AddASAPWork(
OutputModelManager::WORK_SCREEN_LOCATION_CHANGE,
wxString::Format("BulkEditRotate%c", axis).ToStdString());
}

void LayoutPanel::BulkEditPixelStyle() {
std::vector<Model*> modelsToEdit = GetSelectedModelsForEdit();
// remember the selected models
Expand Down Expand Up @@ -5386,6 +5468,11 @@ void LayoutPanel::AddBulkEditOptionsToMenu(wxMenu* mnuBulkEdit) {
mnuBulkEdit->Append(ID_PREVIEW_BULKEDIT_BLACKTRANSPARENCY, "Black Transparency");
mnuBulkEdit->Append(ID_PREVIEW_BULKEDIT_SHADOWMODELFOR, "Shadow Model For");

mnuBulkEdit->AppendSeparator();
mnuBulkEdit->Append(ID_PREVIEW_BULKEDIT_ROTATEX, "Rotate X");
mnuBulkEdit->Append(ID_PREVIEW_BULKEDIT_ROTATEY, "Rotate Y");
mnuBulkEdit->Append(ID_PREVIEW_BULKEDIT_ROTATEZ, "Rotate Z");

mnuBulkEdit->AppendSeparator();
mnuBulkEdit->Append(ID_PREVIEW_BULKEDIT_CONTROLLERCONNECTION, "Controller Port");
mnuBulkEdit->Append(ID_PREVIEW_BULKEDIT_CONTROLLERCONNECTIONINCREMENT, "Controller Port and Increment");
Expand Down Expand Up @@ -5607,6 +5694,12 @@ void LayoutPanel::OnPreviewModelPopup(wxCommandEvent& event)
BulkEditTagColour();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_PIXELSIZE) {
BulkEditPixelSize();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_ROTATEX) {
BulkEditRotateX();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_ROTATEY) {
BulkEditRotateY();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_ROTATEZ) {
BulkEditRotateZ();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_PIXELSTYLE) {
BulkEditPixelStyle();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_TRANSPARENCY) {
Expand Down Expand Up @@ -8427,6 +8520,12 @@ void LayoutPanel::OnModelsPopup(wxCommandEvent& event) {
BulkEditTagColour();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_PIXELSIZE) {
BulkEditPixelSize();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_ROTATEX) {
BulkEditRotateX();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_ROTATEY) {
BulkEditRotateY();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_ROTATEZ) {
BulkEditRotateZ();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_PIXELSTYLE) {
BulkEditPixelStyle();
} else if (event.GetId() == ID_PREVIEW_BULKEDIT_TRANSPARENCY) {
Expand Down
7 changes: 7 additions & 0 deletions src-ui-wx/layout/LayoutPanel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ class LayoutPanel: public wxPanel
static const long ID_PREVIEW_BULKEDIT_SMARTREMOTETYPE;
static const long ID_PREVIEW_BULKEDIT_PREVIEW;
static const long ID_PREVIEW_BULKEDIT_DIMMINGCURVES;
static const long ID_PREVIEW_BULKEDIT_ROTATEX;
static const long ID_PREVIEW_BULKEDIT_ROTATEY;
static const long ID_PREVIEW_BULKEDIT_ROTATEZ;
static const long ID_PREVIEW_ALIGN_TOP;
static const long ID_PREVIEW_ALIGN_BOTTOM;
static const long ID_PREVIEW_ALIGN_GROUND;
Expand Down Expand Up @@ -403,6 +406,10 @@ class LayoutPanel: public wxPanel
void BulkEditControllerPreview();
void BulkEditGroupControllerPreview();
void BulkEditDimmingCurves();
void BulkEditRotateX();
void BulkEditRotateY();
void BulkEditRotateZ();
void BulkEditRotateAxis(char axis);
void ReplaceModel();
void EditSubModelAlias();
void ShowNodeLayout();
Expand Down
Loading