Skip to content

Commit 6793d4a

Browse files
k1-801CalcProgrammer1
k1-801
authored and
CalcProgrammer1
committed
Move Autogenerated UI code into Private sections of the window classes
1 parent 4c6bf55 commit 6793d4a

File tree

45 files changed

+940
-531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+940
-531
lines changed

‎PluginManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <QDir>
1818
#include "OpenRGBPluginInterface.h"
1919

20-
typedef struct
20+
struct OpenRGBPluginEntry
2121
{
2222
OpenRGBPluginInfo info;
2323
OpenRGBPluginInterface* plugin;
@@ -29,7 +29,7 @@ typedef struct
2929
bool incompatible;
3030
bool is_system;
3131
int api_version;
32-
} OpenRGBPluginEntry;
32+
};
3333

3434
typedef void (*AddPluginCallback)(void *, OpenRGBPluginEntry* plugin);
3535
typedef void (*RemovePluginCallback)(void *, OpenRGBPluginEntry* plugin);

‎qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.cpp

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,74 @@ void OpenRGBDMXSettingsEntry::changeEvent(QEvent *event)
3131
ui->retranslateUi(this);
3232
}
3333
}
34+
35+
void OpenRGBDMXSettingsEntry::loadFromSettings(const json& data)
36+
{
37+
if(data.contains("name"))
38+
{
39+
ui->NameEdit->setText(QString::fromStdString(data["name"]));
40+
}
41+
42+
if(data.contains("port"))
43+
{
44+
ui->PortEdit->setText(QString::fromStdString(data["port"]));
45+
}
46+
47+
if(data.contains("red_channel"))
48+
{
49+
ui->RedEdit->setText(QString::number((int)data["red_channel"]));
50+
}
51+
52+
if(data.contains("green_channel"))
53+
{
54+
ui->GreenEdit->setText(QString::number((int)data["green_channel"]));
55+
}
56+
57+
if(data.contains("blue_channel"))
58+
{
59+
ui->BlueEdit->setText(QString::number((int)data["blue_channel"]));
60+
}
61+
62+
if(data.contains("brightness_channel"))
63+
{
64+
ui->BrightnessEdit->setText(QString::number((int)data["brightness_channel"]));
65+
}
66+
67+
if(data.contains("keepalive_time"))
68+
{
69+
ui->KeepaliveTimeEdit->setText(QString::number((int)data["keepalive_time"]));
70+
}
71+
}
72+
73+
json OpenRGBDMXSettingsEntry::saveSettings()
74+
{
75+
json result;
76+
/*-------------------------------------------------*\
77+
| Required parameters |
78+
\*-------------------------------------------------*/
79+
result["name"] = ui->NameEdit->text().toStdString();
80+
result["port"] = ui->PortEdit->text().toStdString();
81+
result["red_channel"] = ui->RedEdit->text().toUInt();
82+
result["green_channel"] = ui->GreenEdit->text().toUInt();
83+
result["blue_channel"] = ui->BlueEdit->text().toUInt();
84+
85+
/*-------------------------------------------------*\
86+
| Optional parameters |
87+
\*-------------------------------------------------*/
88+
if(ui->BrightnessEdit->text() != "")
89+
{
90+
result["brightness_channel"] = ui->BrightnessEdit->text().toUInt();
91+
}
92+
93+
if(ui->KeepaliveTimeEdit->text() != "")
94+
{
95+
result["keepalive_time"] = ui->KeepaliveTimeEdit->text().toUInt();
96+
}
97+
98+
return result;
99+
}
100+
101+
const char* OpenRGBDMXSettingsEntry::settingsSection()
102+
{
103+
return "DMXDevices";
104+
}

‎qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
#pragma once
1111

1212
#include <QWidget>
13-
#include "ui_OpenRGBDMXSettingsEntry.h"
13+
#include "nlohmann/json.hpp"
14+
15+
using json = nlohmann::json;
1416

1517
namespace Ui
1618
{
1719
class OpenRGBDMXSettingsEntry;
20+
class OpenRGBDMXSettingsEntryUi;
1821
}
1922

2023
class Ui::OpenRGBDMXSettingsEntry : public QWidget
@@ -24,6 +27,11 @@ class Ui::OpenRGBDMXSettingsEntry : public QWidget
2427
public:
2528
explicit OpenRGBDMXSettingsEntry(QWidget *parent = nullptr);
2629
~OpenRGBDMXSettingsEntry();
30+
void loadFromSettings(const json& data);
31+
json saveSettings();
32+
const char* settingsSection();
33+
34+
private:
2735
Ui::OpenRGBDMXSettingsEntryUi *ui;
2836

2937
private slots:

‎qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsPage.cpp

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -36,40 +36,7 @@ OpenRGBDMXSettingsPage::OpenRGBDMXSettingsPage(QWidget *parent) :
3636
{
3737
OpenRGBDMXSettingsEntry* entry = new OpenRGBDMXSettingsEntry;
3838

39-
if(dmx_settings["devices"][device_idx].contains("name"))
40-
{
41-
entry->ui->NameEdit->setText(QString::fromStdString(dmx_settings["devices"][device_idx]["name"]));
42-
}
43-
44-
if(dmx_settings["devices"][device_idx].contains("port"))
45-
{
46-
entry->ui->PortEdit->setText(QString::fromStdString(dmx_settings["devices"][device_idx]["port"]));
47-
}
48-
49-
if(dmx_settings["devices"][device_idx].contains("red_channel"))
50-
{
51-
entry->ui->RedEdit->setText(QString::number((int)dmx_settings["devices"][device_idx]["red_channel"]));
52-
}
53-
54-
if(dmx_settings["devices"][device_idx].contains("green_channel"))
55-
{
56-
entry->ui->GreenEdit->setText(QString::number((int)dmx_settings["devices"][device_idx]["green_channel"]));
57-
}
58-
59-
if(dmx_settings["devices"][device_idx].contains("blue_channel"))
60-
{
61-
entry->ui->BlueEdit->setText(QString::number((int)dmx_settings["devices"][device_idx]["blue_channel"]));
62-
}
63-
64-
if(dmx_settings["devices"][device_idx].contains("brightness_channel"))
65-
{
66-
entry->ui->BrightnessEdit->setText(QString::number((int)dmx_settings["devices"][device_idx]["brightness_channel"]));
67-
}
68-
69-
if(dmx_settings["devices"][device_idx].contains("keepalive_time"))
70-
{
71-
entry->ui->KeepaliveTimeEdit->setText(QString::number((int)dmx_settings["devices"][device_idx]["keepalive_time"]));
72-
}
39+
entry->loadFromSettings(dmx_settings["devices"][device_idx]);
7340

7441
entries.push_back(entry);
7542

@@ -142,27 +109,7 @@ void Ui::OpenRGBDMXSettingsPage::on_SaveDMXConfigurationButton_clicked()
142109

143110
for(unsigned int device_idx = 0; device_idx < entries.size(); device_idx++)
144111
{
145-
/*-------------------------------------------------*\
146-
| Required parameters |
147-
\*-------------------------------------------------*/
148-
dmx_settings["devices"][device_idx]["name"] = entries[device_idx]->ui->NameEdit->text().toStdString();
149-
dmx_settings["devices"][device_idx]["port"] = entries[device_idx]->ui->PortEdit->text().toStdString();
150-
dmx_settings["devices"][device_idx]["red_channel"] = entries[device_idx]->ui->RedEdit->text().toUInt();
151-
dmx_settings["devices"][device_idx]["green_channel"] = entries[device_idx]->ui->GreenEdit->text().toUInt();
152-
dmx_settings["devices"][device_idx]["blue_channel"] = entries[device_idx]->ui->BlueEdit->text().toUInt();
153-
154-
/*-------------------------------------------------*\
155-
| Optional parameters |
156-
\*-------------------------------------------------*/
157-
if(entries[device_idx]->ui->BrightnessEdit->text() != "")
158-
{
159-
dmx_settings["devices"][device_idx]["brightness_channel"] = entries[device_idx]->ui->BrightnessEdit->text().toUInt();
160-
}
161-
162-
if(entries[device_idx]->ui->KeepaliveTimeEdit->text() != "")
163-
{
164-
dmx_settings["devices"][device_idx]["keepalive_time"] = entries[device_idx]->ui->KeepaliveTimeEdit->text().toUInt();
165-
}
112+
dmx_settings["devices"][device_idx] = entries[device_idx]->saveSettings();
166113
}
167114

168115
ResourceManager::get()->GetSettingsManager()->SetSettings("DMXDevices", dmx_settings);

‎qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,204 @@ void Ui::OpenRGBE131SettingsEntry::on_TypeComboBox_currentIndexChanged(int index
8989
HideMatrixSettings();
9090
}
9191
}
92+
93+
void OpenRGBE131SettingsEntry::loadFromSettings(const json& data)
94+
{
95+
if(data.contains("name"))
96+
{
97+
ui->NameEdit->setText(QString::fromStdString(data["name"]));
98+
}
99+
100+
if(data.contains("ip"))
101+
{
102+
ui->IPEdit->setText(QString::fromStdString(data["ip"]));
103+
}
104+
105+
if(data.contains("start_universe"))
106+
{
107+
ui->StartUniverseEdit->setText(QString::number((int)data["start_universe"]));
108+
}
109+
110+
if(data.contains("start_channel"))
111+
{
112+
ui->StartChannelEdit->setText(QString::number((int)data["start_channel"]));
113+
}
114+
115+
if(data.contains("num_leds"))
116+
{
117+
ui->NumLEDsEdit->setText(QString::number((int)data["num_leds"]));
118+
}
119+
120+
if(data.contains("type"))
121+
{
122+
if(data["type"].is_string())
123+
{
124+
std::string type_val = data["type"];
125+
126+
if(type_val == "SINGLE")
127+
{
128+
ui->TypeComboBox->setCurrentIndex(0);
129+
}
130+
else if(type_val == "LINEAR")
131+
{
132+
ui->TypeComboBox->setCurrentIndex(1);
133+
}
134+
else if(type_val == "MATRIX")
135+
{
136+
ui->TypeComboBox->setCurrentIndex(2);
137+
}
138+
}
139+
else
140+
{
141+
ui->TypeComboBox->setCurrentIndex(data["type"]);
142+
}
143+
}
144+
145+
if(data.contains("rgb_order"))
146+
{
147+
if(data["rgb_order"].is_string())
148+
{
149+
std::string rgb_order_val = data["rgb_order"];
150+
151+
if(rgb_order_val == "RGB")
152+
{
153+
ui->RGBOrderComboBox->setCurrentIndex(0);
154+
}
155+
else if(rgb_order_val == "RBG")
156+
{
157+
ui->RGBOrderComboBox->setCurrentIndex(1);
158+
}
159+
else if(rgb_order_val == "GRB")
160+
{
161+
ui->RGBOrderComboBox->setCurrentIndex(2);
162+
}
163+
else if(rgb_order_val == "GBR")
164+
{
165+
ui->RGBOrderComboBox->setCurrentIndex(3);
166+
}
167+
else if(rgb_order_val == "BRG")
168+
{
169+
ui->RGBOrderComboBox->setCurrentIndex(4);
170+
}
171+
else if(rgb_order_val == "BGR")
172+
{
173+
ui->RGBOrderComboBox->setCurrentIndex(5);
174+
}
175+
}
176+
else
177+
{
178+
ui->RGBOrderComboBox->setCurrentIndex(data["rgb_order"]);
179+
}
180+
}
181+
182+
if(data.contains("matrix_width"))
183+
{
184+
ui->MatrixWidthEdit->setText(QString::number((int)data["matrix_width"]));
185+
}
186+
187+
if(data.contains("matrix_height"))
188+
{
189+
ui->MatrixHeightEdit->setText(QString::number((int)data["matrix_height"]));
190+
}
191+
192+
if(data.contains("matrix_order"))
193+
{
194+
if(data["matrix_order"].is_string())
195+
{
196+
std::string matrix_order_val = data["matrix_order"];
197+
198+
if(matrix_order_val == "HORIZONTAL_TOP_LEFT")
199+
{
200+
ui->MatrixOrderComboBox->setCurrentIndex(0);
201+
}
202+
else if(matrix_order_val == "HORIZONTAL_TOP_RIGHT")
203+
{
204+
ui->MatrixOrderComboBox->setCurrentIndex(1);
205+
}
206+
else if(matrix_order_val == "HORIZONTAL_BOTTOM_LEFT")
207+
{
208+
ui->MatrixOrderComboBox->setCurrentIndex(2);
209+
}
210+
else if(matrix_order_val == "HORIZONTAL_BOTTOM_RIGHT")
211+
{
212+
ui->MatrixOrderComboBox->setCurrentIndex(3);
213+
}
214+
else if(matrix_order_val == "VERTICAL_TOP_LEFT")
215+
{
216+
ui->MatrixOrderComboBox->setCurrentIndex(4);
217+
}
218+
else if(matrix_order_val == "VERTICAL_TOP_RIGHT")
219+
{
220+
ui->MatrixOrderComboBox->setCurrentIndex(5);
221+
}
222+
else if(matrix_order_val == "VERTICAL_BOTTOM_LEFT")
223+
{
224+
ui->MatrixOrderComboBox->setCurrentIndex(6);
225+
}
226+
else if(matrix_order_val == "VERTICAL_BOTTOM_RIGHT")
227+
{
228+
ui->MatrixOrderComboBox->setCurrentIndex(7);
229+
}
230+
}
231+
else
232+
{
233+
ui->MatrixOrderComboBox->setCurrentIndex(data["matrix_order"]);
234+
}
235+
}
236+
237+
if(data.contains("universe_size"))
238+
{
239+
ui->UniverseSizeEdit->setText(QString::number((int)data["universe_size"]));
240+
}
241+
242+
if(data.contains("keepalive_time"))
243+
{
244+
ui->KeepaliveTimeEdit->setText(QString::number((int)data["keepalive_time"]));
245+
}
246+
}
247+
248+
json OpenRGBE131SettingsEntry::saveSettings()
249+
{
250+
json result;
251+
/*-------------------------------------------------*\
252+
| Required parameters |
253+
\*-------------------------------------------------*/
254+
result["name"] = ui->NameEdit->text().toStdString();
255+
result["start_universe"] = ui->StartUniverseEdit->text().toUInt();
256+
result["start_channel"] = ui->StartChannelEdit->text().toUInt();
257+
result["num_leds"] = ui->NumLEDsEdit->text().toUInt();
258+
result["type"] = ui->TypeComboBox->currentIndex();
259+
result["rgb_order"] = ui->RGBOrderComboBox->currentIndex();
260+
261+
/*-------------------------------------------------*\
262+
| Optional parameters |
263+
\*-------------------------------------------------*/
264+
if(ui->IPEdit->text() != "")
265+
{
266+
result["ip"] = ui->IPEdit->text().toStdString();
267+
}
268+
269+
if(result["type"] == 2)
270+
{
271+
result["matrix_width"] = ui->MatrixWidthEdit->text().toUInt();
272+
result["matrix_height"] = ui->MatrixHeightEdit->text().toUInt();
273+
result["matrix_order"] = ui->MatrixOrderComboBox->currentIndex();
274+
}
275+
276+
if(ui->UniverseSizeEdit->text() != "")
277+
{
278+
result["universe_size"] = ui->UniverseSizeEdit->text().toUInt();
279+
}
280+
281+
if(ui->KeepaliveTimeEdit->text() != "")
282+
{
283+
result["keepalive_time"] = ui->KeepaliveTimeEdit->text().toUInt();
284+
}
285+
286+
return result;
287+
}
288+
289+
const char* OpenRGBE131SettingsEntry::settingsSection()
290+
{
291+
return "E131Devices";
292+
}

0 commit comments

Comments
 (0)