Showing the changes to interface/src/Swatch.cpp (1 of 9 files). Show all
Unified · Split
| @@ -1,20 +1,18 @@ | |||
| 1 | #include "Swatch.h" | 1 | #include "Swatch.h" |
| 2 | #include <iostream> | 2 | #include <iostream> |
| 3 | 3 | ||
| 4 | Swatch::Swatch(QAction* action) : Tool(action, 0, -1, -1), | 4 | Swatch::Swatch(QAction* action) : |
| 5 | _selected(1), | 5 | Tool(action, 0, -1, -1), |
| 6 | _textRenderer(MONO_FONT_FAMILY, 10, 100) { | 6 | _selected(1), |
| 7 | _textRenderer(MONO_FONT_FAMILY, 10, 100) { | ||
| 7 | } | 8 | } |
| 8 | 9 | ||
| 9 | void Swatch::reset() { | 10 | void Swatch::reset() { |
| 10 | _colors[0].setRgb(237, 175, 0); | 11 | for (int i = 0; i < 8; ++i) { |
| 11 | _colors[1].setRgb(161, 211, 72); | 12 | _colors[i].setRgb(colorBase[i][0], |
| 12 | _colors[2].setRgb(51, 204, 204); | 13 | colorBase[i][1], |
| 13 | _colors[3].setRgb(63, 169, 245); | 14 | colorBase[i][2]); |
| 14 | _colors[4].setRgb(193, 99, 122); | 15 | } |
| 15 | _colors[5].setRgb(255, 54, 69); | ||
| 16 | _colors[6].setRgb(124, 36, 36); | ||
| 17 | _colors[7].setRgb(63, 35, 19); | ||
| 18 | } | 16 | } |
| 19 | 17 | ||
| 20 | QColor Swatch::getColor() { | 18 | QColor Swatch::getColor() { |
| @@ -36,13 +34,13 @@ void Swatch::saveData(QSettings* settings) { · 15 unmodified lines | |||
| 36 | settings->beginGroup("Swatch"); | 34 | settings->beginGroup("Swatch"); |
| 37 | 35 | ||
| 38 | for (int i(0); i < SWATCH_SIZE; ++i) { | 36 | for (int i(0); i < SWATCH_SIZE; ++i) { |
| 39 | QString name("R1"); | 37 | QString rx("R1"), gx("G1"), bx("B1"); |
| 40 | name[1] = '1' + i; | 38 | rx[1] = '1' + i; |
| 41 | settings->setValue(name, _colors[i].red()); | 39 | gx[1] = rx[1]; |
| 42 | name[0] = 'G'; | 40 | bx[1] = rx[1]; |
| 43 | settings->setValue(name, _colors[i].green()); | 41 | settings->setValue(rx, _colors[i].red()); |
| 44 | name[0] = 'B'; | 42 | settings->setValue(gx, _colors[i].green()); |
| 45 | settings->setValue(name, _colors[i].blue()); | 43 | settings->setValue(bx, _colors[i].blue()); |
| 46 | } | 44 | } |
| 47 | 45 | ||
| 48 | settings->endGroup(); | 46 | settings->endGroup(); |
| @@ -51,30 +49,15 @@ void Swatch::saveData(QSettings* settings) { · 2 unmodified lines | |||
| 51 | void Swatch::loadData(QSettings* settings) { | 49 | void Swatch::loadData(QSettings* settings) { |
| 52 | settings->beginGroup("Swatch"); | 50 | settings->beginGroup("Swatch"); |
| 53 | 51 | ||
| 54 | _colors[0].setRgb(settings->value("R1", 237).toInt(), | 52 | for (int i = 0; i < SWATCH_SIZE; ++i) { |
| 55 | settings->value("G1", 175).toInt(), | 53 | QString rx("R1"), gx("G1"), bx("B1"); |
| 56 | settings->value("B1", 0).toInt()); | 54 | rx[1] = '1' + i; |
| 57 | _colors[1].setRgb(settings->value("R2", 161).toInt(), | 55 | gx[1] = rx[1]; |
| 58 | settings->value("G2", 211).toInt(), | 56 | bx[1] = rx[1]; |
| 59 | settings->value("B2", 72).toInt()); | 57 | _colors[i].setRgb(settings->value(rx, colorBase[i][0]).toInt(), |
| 60 | _colors[2].setRgb(settings->value("R3", 51).toInt(), | 58 | settings->value(gx, colorBase[i][1]).toInt(), |
| 61 | settings->value("G3", 204).toInt(), | 59 | settings->value(bx, colorBase[i][2]).toInt()); |
| 62 | settings->value("B3", 204).toInt()); | 60 | } |
| 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()); | ||
| 78 | 61 | ||
| 79 | settings->endGroup(); | 62 | settings->endGroup(); |
| 80 | 63 | ||
| @@ -118,8 +101,7 @@ void Swatch::handleEvent(int key, bool getColor) { · 37 unmodified lines | |||
| 118 | _selected = next; | 101 | _selected = next; |
| 119 | _colors[_selected - 1] = _action->data().value<QColor>(); | 102 | _colors[_selected - 1] = _action->data().value<QColor>(); |
| 120 | } | 103 | } |
| 121 | } | 104 | } else { |
| 122 | else { | ||
| 123 | _selected = next; | 105 | _selected = next; |
| 124 | QPixmap map(16, 16); | 106 | QPixmap map(16, 16); |
| 125 | map.fill(_colors[_selected - 1]); | 107 | map.fill(_colors[_selected - 1]); |
| @@ -130,61 +112,58 @@ void Swatch::handleEvent(int key, bool getColor) { · 4 unmodified lines | |||
| 130 | 112 | ||
| 131 | void Swatch::render(int width, int height) { | 113 | void Swatch::render(int width, int height) { |
| 132 | char str[2]; | 114 | char str[2]; |
| 133 | int margin = 0.10f*height; | 115 | int margin = 0.10f * height; |
| 134 | height = 0.75f*height; | 116 | height = 0.75f * height; |
| 135 | 117 | ||
| 136 | glBegin(GL_QUADS); | 118 | glBegin(GL_QUADS); |
| 137 | glColor3f(0.0f, 0.0f, 0.0f); | 119 | glColor3f(0.0f, 0.0f, 0.0f); |
| 138 | glVertex2f(0, 8*(height - margin) + margin); | 120 | glVertex2f(0, 8 * (height - margin) + margin); |
| 139 | glVertex2f(width, 8*(height - margin) + margin); | 121 | glVertex2f(width, 8 * (height - margin) + margin); |
| 140 | glVertex2f(width, 0); | 122 | glVertex2f(width, 0); |
| 141 | glVertex2f(0, 0); | 123 | glVertex2f(0, 0); |
| 142 | glEnd(); | 124 | glEnd(); |
| 143 | 125 | ||
| 144 | for (unsigned int i(0); i < SWATCH_SIZE; ++i) { | 126 | for (unsigned int i = 0; i < SWATCH_SIZE; ++i) { |
| 145 | glBegin(GL_QUADS); | 127 | glBegin(GL_QUADS); |
| 146 | glColor3f(_colors[i].redF(), | 128 | glColor3f(_colors[i].redF(), |
| 147 | _colors[i].greenF(), | 129 | _colors[i].greenF(), |
| 148 | _colors[i].blueF()); | 130 | _colors[i].blueF()); |
| 149 | glVertex2f(margin, (i + 1)*(height - margin)); | 131 | glVertex2f(margin , (i + 1) * (height - margin)); |
| 150 | glVertex2f(width - margin, (i + 1)*(height - margin)); | 132 | glVertex2f(width - margin, (i + 1) * (height - margin)); |
| 151 | glVertex2f(width - margin, i*(height - margin) + margin); | 133 | glVertex2f(width - margin, i * (height - margin) + margin); |
| 152 | glVertex2f(margin, i*(height - margin) + margin); | 134 | glVertex2f(margin , i * (height - margin) + margin); |
| 153 | glEnd(); | 135 | glEnd(); |
| 154 | 136 | ||
| 155 | if (_colors[i].lightness() < 50) { | 137 | if (_colors[i].lightness() < 50) { |
| 156 | glBegin(GL_LINES); | 138 | glBegin(GL_LINES); |
| 157 | glColor3f(1.0f, 1.0f, 1.0f); | 139 | glColor3f(1.0f, 1.0f, 1.0f); |
| 158 | glVertex2f(margin, (i + 1)*(height - margin)); | 140 | glVertex2f(margin , (i + 1) * (height - margin)); |
| 159 | glVertex2f(width - margin, (i + 1)*(height - margin)); | 141 | glVertex2f(width - margin, (i + 1) * (height - margin)); |
| 160 | 142 | ||
| 161 | glVertex2f(width - margin, (i + 1)*(height - margin)); | 143 | glVertex2f(width - margin, (i + 1) * (height - margin)); |
| 162 | glVertex2f(width - margin, i*(height - margin) + margin); | 144 | glVertex2f(width - margin, i * (height - margin) + margin); |
| 163 | 145 | ||
| 164 | glVertex2f(width - margin, i*(height - margin) + margin); | 146 | glVertex2f(width - margin, i * (height - margin) + margin); |
| 165 | glVertex2f(margin, i*(height - margin) + margin); | 147 | glVertex2f(margin , i * (height - margin) + margin); |
| 166 | 148 | ||
| 167 | glVertex2f(margin, i*(height - margin) + margin); | 149 | glVertex2f(margin , i * (height - margin) + margin); |
| 168 | glVertex2f(margin, (i + 1)*(height - margin)); | 150 | glVertex2f(margin , (i + 1) * (height - margin)); |
| 169 | glEnd(); | 151 | glEnd(); |
| 170 | 152 | } else { | |
| 171 | |||
| 172 | } | ||
| 173 | else { | ||
| 174 | glColor3f(0.0f, 0.0f, 0.0f); | 153 | glColor3f(0.0f, 0.0f, 0.0f); |
| 175 | } | 154 | } |
| 176 | 155 | ||
| 177 | if (_selected == i + 1) { | 156 | if (_selected == i + 1) { |
| 178 | glBegin(GL_TRIANGLES); | 157 | glBegin(GL_TRIANGLES); |
| 179 | glVertex2f(margin, (i + 1)*(height - margin) - margin); | 158 | glVertex2f(margin , (i + 1) * (height - margin) - margin); |
| 180 | glVertex2f(width/4 - margin, i*(height - margin) + height/2.0f); | 159 | glVertex2f(width/4 - margin, i * (height - margin) + height / 2.0f); |
| 181 | glVertex2f(margin, i*(height - margin) + margin + margin); | 160 | glVertex2f(margin , i * (height - margin) + margin + margin); |
| 182 | glEnd(); | 161 | glEnd(); |
| 183 | } | 162 | } |
| 184 | 163 | ||
| 185 | sprintf(str, "%d", i + 1); | 164 | 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); |
| 187 | } | 166 | } |
| 188 | 167 | ||
| 189 | glTranslated(0, 8*(height - margin) + margin + 0.075f*height, 0); | 168 | glTranslated(0, 8 * (height - margin) + margin + 0.075f * height, 0); |
| 190 | } | 169 | } |