History

Modified code according to review for UI job

atlante45 committed 13 years ago

Commit d38c1f01 parent b0622959 files · +132 −146Browse files

Showing the changes to interface/src/Swatch.cpp (1 of 9 files). Show all

Unified · Split

interface/src/Swatch.cpp+49−70
@@ -1,20 +1,18 @@
11 #include "Swatch.h"
22 #include <iostream>
33
4−Swatch::Swatch(QAction* action) : Tool(action, 0, -1, -1),
5− _selected(1),
6− _textRenderer(MONO_FONT_FAMILY, 10, 100) {
4+Swatch::Swatch(QAction* action) :
5+ Tool(action, 0, -1, -1),
6+ _selected(1),
7+ _textRenderer(MONO_FONT_FAMILY, 10, 100) {
78 }
89
910 void Swatch::reset() {
10− _colors[0].setRgb(237, 175, 0);
11− _colors[1].setRgb(161, 211, 72);
12− _colors[2].setRgb(51, 204, 204);
13− _colors[3].setRgb(63, 169, 245);
14− _colors[4].setRgb(193, 99, 122);
15− _colors[5].setRgb(255, 54, 69);
16− _colors[6].setRgb(124, 36, 36);
17− _colors[7].setRgb(63, 35, 19);
11+ for (int i = 0; i < 8; ++i) {
12+ _colors[i].setRgb(colorBase[i][0],
13+ colorBase[i][1],
14+ colorBase[i][2]);
15+ }
1816 }
1917
2018 QColor Swatch::getColor() {
@@ -36,13 +34,13 @@ void Swatch::saveData(QSettings* settings) { · 15 unmodified lines
3634 settings->beginGroup("Swatch");
3735
3836 for (int i(0); i < SWATCH_SIZE; ++i) {
39− QString name("R1");
40− name[1] = '1' + i;
41− settings->setValue(name, _colors[i].red());
42− name[0] = 'G';
43− settings->setValue(name, _colors[i].green());
44− name[0] = 'B';
45− settings->setValue(name, _colors[i].blue());
37+ QString rx("R1"), gx("G1"), bx("B1");
38+ rx[1] = '1' + i;
39+ gx[1] = rx[1];
40+ bx[1] = rx[1];
41+ settings->setValue(rx, _colors[i].red());
42+ settings->setValue(gx, _colors[i].green());
43+ settings->setValue(bx, _colors[i].blue());
4644 }
4745
4846 settings->endGroup();
@@ -51,30 +49,15 @@ void Swatch::saveData(QSettings* settings) { · 2 unmodified lines
5149 void Swatch::loadData(QSettings* settings) {
5250 settings->beginGroup("Swatch");
5351
54− _colors[0].setRgb(settings->value("R1", 237).toInt(),
55− settings->value("G1", 175).toInt(),
56− settings->value("B1", 0).toInt());
57− _colors[1].setRgb(settings->value("R2", 161).toInt(),
58− settings->value("G2", 211).toInt(),
59− settings->value("B2", 72).toInt());
60− _colors[2].setRgb(settings->value("R3", 51).toInt(),
61− settings->value("G3", 204).toInt(),
62− settings->value("B3", 204).toInt());
63− _colors[3].setRgb(settings->value("R4", 63).toInt(),
64− settings->value("G4", 169).toInt(),
65− settings->value("B4", 245).toInt());
66− _colors[4].setRgb(settings->value("R5", 193).toInt(),
67− settings->value("G5", 99).toInt(),
68− settings->value("B5", 122).toInt());
69− _colors[5].setRgb(settings->value("R6", 255).toInt(),
70− settings->value("G6", 54).toInt(),
71− settings->value("B6", 69).toInt());
72− _colors[6].setRgb(settings->value("R7", 124).toInt(),
73− settings->value("G7", 36).toInt(),
74− settings->value("B7", 36).toInt());
75− _colors[7].setRgb(settings->value("R8", 63).toInt(),
76− settings->value("G8", 35).toInt(),
77− settings->value("B8", 19).toInt());
52+ for (int i = 0; i < SWATCH_SIZE; ++i) {
53+ QString rx("R1"), gx("G1"), bx("B1");
54+ rx[1] = '1' + i;
55+ gx[1] = rx[1];
56+ bx[1] = rx[1];
57+ _colors[i].setRgb(settings->value(rx, colorBase[i][0]).toInt(),
58+ settings->value(gx, colorBase[i][1]).toInt(),
59+ settings->value(bx, colorBase[i][2]).toInt());
60+ }
7861
7962 settings->endGroup();
8063
@@ -118,8 +101,7 @@ void Swatch::handleEvent(int key, bool getColor) { · 37 unmodified lines
118101 _selected = next;
119102 _colors[_selected - 1] = _action->data().value<QColor>();
120103 }
121− }
122− else {
104+ } else {
123105 _selected = next;
124106 QPixmap map(16, 16);
125107 map.fill(_colors[_selected - 1]);
@@ -130,61 +112,58 @@ void Swatch::handleEvent(int key, bool getColor) { · 4 unmodified lines
130112
131113 void Swatch::render(int width, int height) {
132114 char str[2];
133− int margin = 0.10f*height;
134− height = 0.75f*height;
115+ int margin = 0.10f * height;
116+ height = 0.75f * height;
135117
136118 glBegin(GL_QUADS);
137119 glColor3f(0.0f, 0.0f, 0.0f);
138− glVertex2f(0, 8*(height - margin) + margin);
139− glVertex2f(width, 8*(height - margin) + margin);
120+ glVertex2f(0, 8 * (height - margin) + margin);
121+ glVertex2f(width, 8 * (height - margin) + margin);
140122 glVertex2f(width, 0);
141123 glVertex2f(0, 0);
142124 glEnd();
143125
144− for (unsigned int i(0); i < SWATCH_SIZE; ++i) {
126+ for (unsigned int i = 0; i < SWATCH_SIZE; ++i) {
145127 glBegin(GL_QUADS);
146128 glColor3f(_colors[i].redF(),
147129 _colors[i].greenF(),
148130 _colors[i].blueF());
149− glVertex2f(margin, (i + 1)*(height - margin));
150− glVertex2f(width - margin, (i + 1)*(height - margin));
151− glVertex2f(width - margin, i*(height - margin) + margin);
152− glVertex2f(margin, i*(height - margin) + margin);
131+ glVertex2f(margin , (i + 1) * (height - margin));
132+ glVertex2f(width - margin, (i + 1) * (height - margin));
133+ glVertex2f(width - margin, i * (height - margin) + margin);
134+ glVertex2f(margin , i * (height - margin) + margin);
153135 glEnd();
154136
155137 if (_colors[i].lightness() < 50) {
156138 glBegin(GL_LINES);
157139 glColor3f(1.0f, 1.0f, 1.0f);
158− glVertex2f(margin, (i + 1)*(height - margin));
159− glVertex2f(width - margin, (i + 1)*(height - margin));
140+ glVertex2f(margin , (i + 1) * (height - margin));
141+ glVertex2f(width - margin, (i + 1) * (height - margin));
160142
161− glVertex2f(width - margin, (i + 1)*(height - margin));
162− glVertex2f(width - margin, i*(height - margin) + margin);
143+ glVertex2f(width - margin, (i + 1) * (height - margin));
144+ glVertex2f(width - margin, i * (height - margin) + margin);
163145
164− glVertex2f(width - margin, i*(height - margin) + margin);
165− glVertex2f(margin, i*(height - margin) + margin);
146+ glVertex2f(width - margin, i * (height - margin) + margin);
147+ glVertex2f(margin , i * (height - margin) + margin);
166148
167− glVertex2f(margin, i*(height - margin) + margin);
168− glVertex2f(margin, (i + 1)*(height - margin));
149+ glVertex2f(margin , i * (height - margin) + margin);
150+ glVertex2f(margin , (i + 1) * (height - margin));
169151 glEnd();
170−
171−
172− }
173− else {
152+ } else {
174153 glColor3f(0.0f, 0.0f, 0.0f);
175154 }
176155
177156 if (_selected == i + 1) {
178157 glBegin(GL_TRIANGLES);
179− glVertex2f(margin, (i + 1)*(height - margin) - margin);
180− glVertex2f(width/4 - margin, i*(height - margin) + height/2.0f);
181− glVertex2f(margin, i*(height - margin) + margin + margin);
158+ glVertex2f(margin , (i + 1) * (height - margin) - margin);
159+ glVertex2f(width/4 - margin, i * (height - margin) + height / 2.0f);
160+ glVertex2f(margin , i * (height - margin) + margin + margin);
182161 glEnd();
183162 }
184163
185164 sprintf(str, "%d", i + 1);
186− _textRenderer.draw(3*width/4, (i + 1)*(height - margin) - 0.2f*height, str);
165+ _textRenderer.draw(3 * width/4, (i + 1) * (height - margin) - 0.2f * height, str);
187166 }
188167
189− glTranslated(0, 8*(height - margin) + margin + 0.075f*height, 0);
168+ glTranslated(0, 8 * (height - margin) + margin + 0.075f * height, 0);
190169 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t