fix(cpn): google earth export#7384
Open
elecpower wants to merge 2 commits into
Open
Conversation
elecpower
added
companion
📝 WalkthroughWalkthroughThe KML export now scans the CSV header to find ChangesDynamic column detection for KML export
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@companion/src/logsdialog.cpp`:
- Around line 349-355: The current loop in Logsdialog (around the incExtraData
block) matches selected extra fields by header text which breaks when headers
are duplicated; instead, store the original CSV column index on each
QTableWidgetItem (e.g., using item->setData(originalIndex, Qt::UserRole) when
populating ui->FieldsTW) and here read that back
(item->data(Qt::UserRole).toInt()) to push into extradataCols; keep the existing
selection check (item->isSelected()) but replace the DisplayRole comparison with
reading the stored original index and append that index to extradataCols so
selection is resolved by column index not by header text.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro Plus
Run ID: cbe1c65e-15b6-4c34-9ca2-6cffa456c65c
📒 Files selected for processing (1)
companion/src/logsdialog.cpp
Comment on lines
+349
to
+355
| if (incExtraData) { | ||
| for (int j = 0; j < ui->FieldsTW->rowCount(); j++) { | ||
| if (ui->FieldsTW->item(j, 0) && ui->FieldsTW->item(j, 0)->isSelected() && | ||
| ui->FieldsTW->item(j, 0)->data(Qt::DisplayRole).toString() == dataPoints.at(0).at(i)) { | ||
| extradataCols << i; // save data index not selection list index | ||
| } | ||
| } |
There was a problem hiding this comment.
Preserve extra-field identity by column index, not header text.
Line 352 resolves selected extras by display text only. If a log has duplicate column labels, selecting one row here will add every matching header to extradataCols, so the KML schema/data can include unintended fields. Store the original CSV column index on each FieldsTW item and read that back here instead of re-matching by name.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@companion/src/logsdialog.cpp` around lines 349 - 355, The current loop in
Logsdialog (around the incExtraData block) matches selected extra fields by
header text which breaks when headers are duplicated; instead, store the
original CSV column index on each QTableWidgetItem (e.g., using
item->setData(originalIndex, Qt::UserRole) when populating ui->FieldsTW) and
here read that back (item->data(Qt::UserRole).toInt()) to push into
extradataCols; keep the existing selection check (item->isSelected()) but
replace the DisplayRole comparison with reading the stored original index and
append that index to extradataCols so selection is resolved by column index not
by header text.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #7381
Summary of changes:
Summary by CodeRabbit