grayhook
/
OpenRGB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make segment type configurable

Browse Source
master
Adam Honse 6 months ago
parent 31a0e2d61f
commit e657f5c8d4
3 changed files with 54 additions and 41 deletions
Show Stats Download Patch File Download Diff File

79
qt/OpenRGBZoneResizeDialog/OpenRGBZoneResizeDialog.cpp
Unescape Escape View File

@ -7,6 +7,7 @@
| SPDX-License-Identifier: GPL-2.0-or-later |
\*---------------------------------------------------------*/
#include <QComboBox>
#include <QLineEdit>
#include "OpenRGBZoneResizeDialog.h"
#include "ui_OpenRGBZoneResizeDialog.h"
@ -26,7 +27,7 @@ OpenRGBZoneResizeDialog::OpenRGBZoneResizeDialog(RGBController* edit_dev_ptr, un
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
QStringList header_labels;
header_labels << "Name" << "Size" << "";
header_labels << "Name" << "Type" << "Size" << "";
ui->SegmentsTreeWidget->setHeaderLabels(header_labels);
ui->ResizeSlider->setRange(size_min, size_max);
@ -37,24 +38,7 @@ OpenRGBZoneResizeDialog::OpenRGBZoneResizeDialog(RGBController* edit_dev_ptr, un
for(unsigned int segment_idx = 0; segment_idx < edit_dev->zones[edit_zone_idx].segments.size(); segment_idx++)
{
QTreeWidgetItem* new_item = new QTreeWidgetItem(ui->SegmentsTreeWidget);
QLineEdit* lineedit_name = new QLineEdit(ui->SegmentsTreeWidget);
QLineEdit* lineedit_length = new QLineEdit(ui->SegmentsTreeWidget);
QSlider* slider_length = new QSlider(Qt::Horizontal, ui->SegmentsTreeWidget);
slider_length->setMaximum(edit_dev->zones[edit_zone_idx].leds_count);
lineedit_name->setText(QString::fromStdString(edit_dev->zones[edit_zone_idx].segments[segment_idx].name));
lineedit_length->setText(QString::number(edit_dev->zones[edit_zone_idx].segments[segment_idx].leds_count));
slider_length->setSliderPosition(edit_dev->zones[edit_zone_idx].segments[segment_idx].leds_count);
ui->SegmentsTreeWidget->setItemWidget(new_item, 0, lineedit_name);
ui->SegmentsTreeWidget->setItemWidget(new_item, 1, lineedit_length);
ui->SegmentsTreeWidget->setItemWidget(new_item, 2, slider_length);
connect(slider_length, &QSlider::valueChanged, this, &OpenRGBZoneResizeDialog::on_segment_slider_valueChanged);
connect(lineedit_length, &QLineEdit::textChanged, this, &OpenRGBZoneResizeDialog::on_segment_lineedit_textChanged);
AddSegmentRow(QString::fromStdString(edit_dev->zones[edit_zone_idx].segments[segment_idx].name), edit_dev->zones[edit_zone_idx].segments[segment_idx].leds_count, edit_dev->zones[edit_zone_idx].segments[segment_idx].type);
}
}
@ -111,7 +95,7 @@ void OpenRGBZoneResizeDialog::on_ResizeSlider_valueChanged(int value)
\*-----------------------------------------------------*/
for(int item_idx = 0; item_idx < ui->SegmentsTreeWidget->topLevelItemCount(); item_idx++)
{
((QSlider*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 2))->setMaximum(value);
((QSlider*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 3))->setMaximum(value);
}
CheckSegmentsValidity();
@ -125,8 +109,8 @@ void OpenRGBZoneResizeDialog::on_segment_lineedit_textChanged()
\*-----------------------------------------------------*/
for(int item_idx = 0; item_idx < ui->SegmentsTreeWidget->topLevelItemCount(); item_idx++)
{
int lineedit_value = ((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 1))->text().toInt();
((QSlider*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 2))->setValue(lineedit_value);
int lineedit_value = ((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 2))->text().toInt();
((QSlider*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 3))->setValue(lineedit_value);
}
CheckSegmentsValidity();
@ -140,8 +124,8 @@ void OpenRGBZoneResizeDialog::on_segment_slider_valueChanged(int)
\*-----------------------------------------------------*/
for(int item_idx = 0; item_idx < ui->SegmentsTreeWidget->topLevelItemCount(); item_idx++)
{
int slider_value = ((QSlider*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 2))->value();
((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 1))->setText(QString::number(slider_value));
int slider_value = ((QSlider*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 3))->value();
((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 2))->setText(QString::number(slider_value));
}
CheckSegmentsValidity();
@ -159,7 +143,7 @@ void OpenRGBZoneResizeDialog::on_ResizeBox_valueChanged(int value)
\*-----------------------------------------------------*/
for(int item_idx = 0; item_idx < ui->SegmentsTreeWidget->topLevelItemCount(); item_idx++)
{
((QSlider*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 2))->setMaximum(value);
((QSlider*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 3))->setMaximum(value);
}
CheckSegmentsValidity();
@ -191,10 +175,10 @@ int OpenRGBZoneResizeDialog::show()
for(int item_idx = 0; item_idx < ui->SegmentsTreeWidget->topLevelItemCount(); item_idx++)
{
segment new_segment;
new_segment.type = ZONE_TYPE_LINEAR;
new_segment.type = ((QComboBox*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 1))->currentIndex();
new_segment.name = ((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 0))->text().toStdString();
new_segment.start_idx = start_idx;
new_segment.leds_count = ((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 1))->text().toInt();
new_segment.leds_count = ((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(item_idx), 2))->text().toInt();
edit_dev->AddSegment(edit_zone_idx, new_segment);
@ -205,7 +189,7 @@ int OpenRGBZoneResizeDialog::show()
return(ret_val);
}
void OpenRGBZoneResizeDialog::on_AddSegmentButton_clicked()
void OpenRGBZoneResizeDialog::AddSegmentRow(QString name, unsigned int length, zone_type type)
{
/*---------------------------------------------------------*\
| Create new line in segments list tree |
@ -215,30 +199,43 @@ void OpenRGBZoneResizeDialog::on_AddSegmentButton_clicked()
/*---------------------------------------------------------*\
| Create new widgets for line |
\*---------------------------------------------------------*/
QComboBox* combobox_type = new QComboBox(ui->SegmentsTreeWidget);
QLineEdit* lineedit_name = new QLineEdit(ui->SegmentsTreeWidget);
QLineEdit* lineedit_length = new QLineEdit(ui->SegmentsTreeWidget);
QSlider* slider_length = new QSlider(Qt::Horizontal, ui->SegmentsTreeWidget);
/*---------------------------------------------------------*\
| Fill in new Name field as "Segment X" |
| Fill in Name field |
\*---------------------------------------------------------*/
lineedit_name->setText(name);
/*---------------------------------------------------------*\
| Set up segment type combo box |
\*---------------------------------------------------------*/
std::string new_name = "Segment ";
combobox_type->addItem("Single");
combobox_type->addItem("Linear");
//combobox_type->addItem("Matrix");
new_name.append(std::to_string(ui->SegmentsTreeWidget->topLevelItemCount() + 1));
combobox_type->setCurrentIndex(type);
lineedit_name->setText(new_name.c_str());
/*---------------------------------------------------------*\
| Fill in Length field |
\*---------------------------------------------------------*/
lineedit_length->setText(QString::number(length));
/*---------------------------------------------------------*\
| Restrict slider maximum to zone size |
| Fill in slider length and maximum |
\*---------------------------------------------------------*/
slider_length->setMaximum(edit_dev->zones[edit_zone_idx].leds_count);
slider_length->setValue(length);
/*---------------------------------------------------------*\
| Add new widgets to tree |
\*---------------------------------------------------------*/
ui->SegmentsTreeWidget->setItemWidget(new_item, 0, lineedit_name);
ui->SegmentsTreeWidget->setItemWidget(new_item, 1, lineedit_length);
ui->SegmentsTreeWidget->setItemWidget(new_item, 2, slider_length);
ui->SegmentsTreeWidget->setItemWidget(new_item, 1, combobox_type);
ui->SegmentsTreeWidget->setItemWidget(new_item, 2, lineedit_length);
ui->SegmentsTreeWidget->setItemWidget(new_item, 3, slider_length);
/*---------------------------------------------------------*\
| Connect signals for handling slider and line edits |
@ -246,6 +243,16 @@ void OpenRGBZoneResizeDialog::on_AddSegmentButton_clicked()
connect(lineedit_name, &QLineEdit::textChanged, this, &OpenRGBZoneResizeDialog::on_segment_lineedit_textChanged);
connect(slider_length, &QSlider::valueChanged, this, &OpenRGBZoneResizeDialog::on_segment_slider_valueChanged);
connect(lineedit_length, &QLineEdit::textChanged, this, &OpenRGBZoneResizeDialog::on_segment_lineedit_textChanged);
}
void OpenRGBZoneResizeDialog::on_AddSegmentButton_clicked()
{
/*---------------------------------------------------------*\
| Create new empty row with name "Segment X" |
\*---------------------------------------------------------*/
QString new_name = "Segment " + QString::number(ui->SegmentsTreeWidget->topLevelItemCount() + 1);
AddSegmentRow(new_name, 0, ZONE_TYPE_LINEAR);
CheckSegmentsValidity();
}
@ -266,7 +273,7 @@ void OpenRGBZoneResizeDialog::CheckSegmentsValidity()
for(int segment_idx = 0; segment_idx < ui->SegmentsTreeWidget->topLevelItemCount(); segment_idx++)
{
unsigned int segment_leds = ((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(segment_idx), 1))->text().toInt();
unsigned int segment_leds = ((QLineEdit*)ui->SegmentsTreeWidget->itemWidget(ui->SegmentsTreeWidget->topLevelItem(segment_idx), 2))->text().toInt();
/*-------------------------------------------------*\
| Zero-length segment is not allowed |

1
qt/OpenRGBZoneResizeDialog/OpenRGBZoneResizeDialog.h
Unescape Escape View File

@ -48,5 +48,6 @@ private:
RGBController* edit_dev;
unsigned int edit_zone_idx;
void AddSegmentRow(QString name, unsigned int length, zone_type type);
void CheckSegmentsValidity();
};

15
qt/OpenRGBZoneResizeDialog/OpenRGBZoneResizeDialog.ui
Unescape Escape View File

@ -41,14 +41,14 @@
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QTreeWidget" name="SegmentsTreeWidget">
<property name="columnCount">
<number>3</number>
<number>4</number>
</property>
<column>
<property name="text">
@ -57,12 +57,17 @@
</column>
<column>
<property name="text">
<string>Type</string>
</property>
</column>
<column>
<property name="text">
<string>Length</string>
</property>
</column>
<column>
<property name="text">
<string> </string>
<string/>
</property>
</column>
</widget>
@ -76,10 +81,10 @@
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>

Write Preview
Loading…
Cancel
Save