Diffstat (limited to 'noncore/graphics/drawpad/drawpadcanvas.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index bcb6877..dcf0871 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp | |||
@@ -38,28 +38,32 @@ public: | |||
38 | 38 | ||
39 | QList<Page> pages(); | 39 | QList<Page> pages(); |
40 | 40 | ||
41 | bool startElement(const QString& namespaceURI, const QString& localName, | 41 | bool startElement(const QString& namespaceURI, const QString& localName, |
42 | const QString& qName, const QXmlAttributes& atts); | 42 | const QString& qName, const QXmlAttributes& atts); |
43 | bool endElement(const QString& namespaceURI, const QString& localName, | 43 | bool endElement(const QString& namespaceURI, const QString& localName, |
44 | const QString& qName); | 44 | const QString& qName); |
45 | bool characters(const QString& ch); | 45 | bool characters(const QString& ch); |
46 | 46 | ||
47 | private: | 47 | private: |
48 | enum State { | 48 | enum State { |
49 | Unknown, | 49 | Unknown, |
50 | InTitle, | ||
51 | InDate, | ||
50 | InData | 52 | InData |
51 | }; | 53 | }; |
52 | 54 | ||
53 | State m_state; | 55 | State m_state; |
56 | QString m_title; | ||
57 | QDateTime m_date; | ||
54 | ulong m_dataLenght; | 58 | ulong m_dataLenght; |
55 | QString m_dataFormat; | 59 | QString m_dataFormat; |
56 | QList<Page> m_pages; | 60 | QList<Page> m_pages; |
57 | }; | 61 | }; |
58 | 62 | ||
59 | DrawPadCanvasXmlHandler::DrawPadCanvasXmlHandler() | 63 | DrawPadCanvasXmlHandler::DrawPadCanvasXmlHandler() |
60 | { | 64 | { |
61 | m_state = Unknown; | 65 | m_state = Unknown; |
62 | } | 66 | } |
63 | 67 | ||
64 | DrawPadCanvasXmlHandler::~DrawPadCanvasXmlHandler() | 68 | DrawPadCanvasXmlHandler::~DrawPadCanvasXmlHandler() |
65 | { | 69 | { |
@@ -67,53 +71,68 @@ DrawPadCanvasXmlHandler::~DrawPadCanvasXmlHandler() | |||
67 | 71 | ||
68 | QList<Page> DrawPadCanvasXmlHandler::pages() | 72 | QList<Page> DrawPadCanvasXmlHandler::pages() |
69 | { | 73 | { |
70 | return m_pages; | 74 | return m_pages; |
71 | } | 75 | } |
72 | 76 | ||
73 | bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QString& localName, | 77 | bool DrawPadCanvasXmlHandler::startElement(const QString& namespaceURI, const QString& localName, |
74 | const QString& qName, const QXmlAttributes& atts) | 78 | const QString& qName, const QXmlAttributes& atts) |
75 | { | 79 | { |
76 | Q_CONST_UNUSED(namespaceURI) | 80 | Q_CONST_UNUSED(namespaceURI) |
77 | Q_CONST_UNUSED(localName) | 81 | Q_CONST_UNUSED(localName) |
78 | 82 | ||
79 | if (qName.compare("data") == 0) { | 83 | if (qName == "image") { |
84 | m_title = QString(); | ||
85 | m_date = QDateTime(QDate(1970, 1, 1)); | ||
86 | } else if (qName == "title") { | ||
87 | m_state = InTitle; | ||
88 | } else if (qName == "date") { | ||
89 | m_state = InDate; | ||
90 | } else if (qName == "data") { | ||
80 | m_state = InData; | 91 | m_state = InData; |
81 | m_dataLenght = atts.value("length").toULong(); | 92 | m_dataLenght = atts.value("length").toULong(); |
82 | m_dataFormat = atts.value("format"); | 93 | m_dataFormat = atts.value("format"); |
83 | 94 | ||
84 | if (m_dataFormat.isEmpty()) { | 95 | if (m_dataFormat.isEmpty()) { |
85 | m_dataFormat = "XPM"; | 96 | m_dataFormat = "XPM"; |
86 | } | 97 | } |
87 | } | 98 | } |
88 | 99 | ||
89 | return true; | 100 | return true; |
90 | } | 101 | } |
91 | 102 | ||
92 | bool DrawPadCanvasXmlHandler::endElement(const QString& namespaceURI, const QString& localName, | 103 | bool DrawPadCanvasXmlHandler::endElement(const QString& namespaceURI, const QString& localName, |
93 | const QString& qName) | 104 | const QString& qName) |
94 | { | 105 | { |
95 | Q_CONST_UNUSED(namespaceURI) | 106 | Q_CONST_UNUSED(namespaceURI) |
96 | Q_CONST_UNUSED(localName) | 107 | Q_CONST_UNUSED(localName) |
97 | 108 | ||
98 | if (qName.compare("data") == 0) { | 109 | if (qName == "title") { |
110 | m_state = Unknown; | ||
111 | } else if (qName == "date") { | ||
112 | m_state = Unknown; | ||
113 | } else if (qName == "data") { | ||
99 | m_state = Unknown; | 114 | m_state = Unknown; |
100 | } | 115 | } |
101 | 116 | ||
102 | return true; | 117 | return true; |
103 | } | 118 | } |
104 | 119 | ||
105 | bool DrawPadCanvasXmlHandler::characters(const QString& ch) | 120 | bool DrawPadCanvasXmlHandler::characters(const QString& ch) |
106 | { | 121 | { |
107 | if (m_state == InData) { | 122 | if (m_state == InTitle) { |
123 | m_title = ch; | ||
124 | } else if (m_state == InDate) { | ||
125 | m_date = m_date.addSecs(ch.toInt()); | ||
126 | } else if (m_state == InData) { | ||
108 | QByteArray byteArray(ch.length() / 2); | 127 | QByteArray byteArray(ch.length() / 2); |
109 | 128 | ||
110 | for (int i = 0; i < (int)ch.length() / 2; i++) { | 129 | for (int i = 0; i < (int)ch.length() / 2; i++) { |
111 | char h = ch[2 * i].latin1(); | 130 | char h = ch[2 * i].latin1(); |
112 | char l = ch[2 * i + 1].latin1(); | 131 | char l = ch[2 * i + 1].latin1(); |
113 | uchar r = 0; | 132 | uchar r = 0; |
114 | 133 | ||
115 | if (h <= '9') { | 134 | if (h <= '9') { |
116 | r += h - '0'; | 135 | r += h - '0'; |
117 | } else { | 136 | } else { |
118 | r += h - 'a' + 10; | 137 | r += h - 'a' + 10; |
119 | } | 138 | } |
@@ -136,25 +155,26 @@ bool DrawPadCanvasXmlHandler::characters(const QString& ch) | |||
136 | if (m_dataLenght < ch.length() * 5) { | 155 | if (m_dataLenght < ch.length() * 5) { |
137 | m_dataLenght = ch.length() * 5; | 156 | m_dataLenght = ch.length() * 5; |
138 | } | 157 | } |
139 | 158 | ||
140 | QByteArray byteArrayUnzipped(m_dataLenght); | 159 | QByteArray byteArrayUnzipped(m_dataLenght); |
141 | ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size()); | 160 | ::uncompress((uchar*)byteArrayUnzipped.data(), &m_dataLenght, (uchar*)byteArray.data(), byteArray.size()); |
142 | 161 | ||
143 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); | 162 | image.loadFromData((const uchar*)byteArrayUnzipped.data(), m_dataLenght, m_dataFormat); |
144 | } else { | 163 | } else { |
145 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); | 164 | image.loadFromData((const uchar*)byteArray.data(), m_dataLenght, m_dataFormat); |
146 | } | 165 | } |
147 | 166 | ||
148 | Page* page = new Page(image.width(), image.height()); | 167 | Page* page = new Page(m_title, image.width(), image.height()); |
168 | page->setLastModified(m_date); | ||
149 | page->convertFromImage(image); | 169 | page->convertFromImage(image); |
150 | m_pages.append(page); | 170 | m_pages.append(page); |
151 | } | 171 | } |
152 | 172 | ||
153 | return true; | 173 | return true; |
154 | } | 174 | } |
155 | 175 | ||
156 | DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name) | 176 | DrawPadCanvas::DrawPadCanvas(DrawPad* drawPad, QWidget* parent, const char* name) |
157 | : QScrollView(parent, name) | 177 | : QScrollView(parent, name) |
158 | { | 178 | { |
159 | m_pDrawPad = drawPad; | 179 | m_pDrawPad = drawPad; |
160 | m_pages.setAutoDelete(true); | 180 | m_pages.setAutoDelete(true); |
@@ -173,65 +193,69 @@ void DrawPadCanvas::load(QIODevice* ioDevice) | |||
173 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); | 193 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); |
174 | 194 | ||
175 | QXmlInputSource xmlInputSource(textStream); | 195 | QXmlInputSource xmlInputSource(textStream); |
176 | QXmlSimpleReader xmlSimpleReader; | 196 | QXmlSimpleReader xmlSimpleReader; |
177 | DrawPadCanvasXmlHandler drawPadCanvasXmlHandler; | 197 | DrawPadCanvasXmlHandler drawPadCanvasXmlHandler; |
178 | 198 | ||
179 | xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); | 199 | xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); |
180 | xmlSimpleReader.parse(xmlInputSource); | 200 | xmlSimpleReader.parse(xmlInputSource); |
181 | 201 | ||
182 | m_pages = drawPadCanvasXmlHandler.pages(); | 202 | m_pages = drawPadCanvasXmlHandler.pages(); |
183 | 203 | ||
184 | if (m_pages.isEmpty()) { | 204 | if (m_pages.isEmpty()) { |
185 | m_pages.append(new Page(contentsRect().size())); | 205 | m_pages.append(new Page("", contentsRect().size())); |
186 | m_pages.current()->fill(Qt::white); | 206 | m_pages.current()->fill(Qt::white); |
187 | } | 207 | } |
188 | 208 | ||
189 | m_pageBackups.clear(); | 209 | m_pageBackups.clear(); |
190 | m_pageBackups.append(new Page(*(m_pages.current()))); | 210 | m_pageBackups.append(new Page(*(m_pages.current()))); |
191 | 211 | ||
192 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 212 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
193 | viewport()->update(); | 213 | viewport()->update(); |
194 | 214 | ||
195 | emit pagesChanged(); | 215 | emit pagesChanged(); |
196 | emit pageBackupsChanged(); | 216 | emit pageBackupsChanged(); |
197 | } | 217 | } |
198 | 218 | ||
199 | void DrawPadCanvas::initialPage() | 219 | void DrawPadCanvas::initialPage() |
200 | { | 220 | { |
201 | m_pages.append(new Page(236, 232)); | 221 | m_pages.append(new Page("", 236, 232)); |
202 | m_pages.current()->fill(Qt::white); | 222 | m_pages.current()->fill(Qt::white); |
203 | 223 | ||
204 | m_pageBackups.clear(); | 224 | m_pageBackups.clear(); |
205 | m_pageBackups.append(new Page(*(m_pages.current()))); | 225 | m_pageBackups.append(new Page(*(m_pages.current()))); |
206 | 226 | ||
207 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 227 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
208 | viewport()->update(); | 228 | viewport()->update(); |
209 | 229 | ||
210 | emit pagesChanged(); | 230 | emit pagesChanged(); |
211 | emit pageBackupsChanged(); | 231 | emit pageBackupsChanged(); |
212 | } | 232 | } |
213 | 233 | ||
214 | void DrawPadCanvas::save(QIODevice* ioDevice) | 234 | void DrawPadCanvas::save(QIODevice* ioDevice) |
215 | { | 235 | { |
216 | QTextStream textStream(ioDevice); | 236 | QTextStream textStream(ioDevice); |
217 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); | 237 | textStream.setCodec(QTextCodec::codecForName("UTF-8")); |
218 | 238 | ||
219 | textStream << "<drawpad>" << endl; | 239 | textStream << "<drawpad>" << endl; |
220 | textStream << " <images>" << endl; | 240 | textStream << " <images>" << endl; |
221 | 241 | ||
222 | QListIterator<Page> bufferIterator(m_pages); | 242 | QListIterator<Page> bufferIterator(m_pages); |
223 | 243 | ||
224 | for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) { | 244 | for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) { |
225 | textStream << " <image>" << endl; | 245 | textStream << " <image>" << endl; |
246 | textStream << " <title>" << bufferIterator.current()->title() << "</title>" << endl; | ||
247 | |||
248 | int intDate = QDateTime(QDate(1970, 1, 1)).secsTo(bufferIterator.current()->lastModified()); | ||
249 | textStream << " <date>" << intDate << "</date>" << endl; | ||
226 | 250 | ||
227 | QImage image = bufferIterator.current()->convertToImage(); | 251 | QImage image = bufferIterator.current()->convertToImage(); |
228 | QByteArray byteArray; | 252 | QByteArray byteArray; |
229 | QBuffer buffer(byteArray); | 253 | QBuffer buffer(byteArray); |
230 | QImageIO imageIO(&buffer, "PNG"); | 254 | QImageIO imageIO(&buffer, "PNG"); |
231 | 255 | ||
232 | buffer.open(IO_WriteOnly); | 256 | buffer.open(IO_WriteOnly); |
233 | imageIO.setImage(image); | 257 | imageIO.setImage(image); |
234 | imageIO.write(); | 258 | imageIO.write(); |
235 | buffer.close(); | 259 | buffer.close(); |
236 | 260 | ||
237 | textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; | 261 | textStream << " <data length=\"" << byteArray.size() << "\" format=\"PNG\">"; |
@@ -332,58 +356,60 @@ void DrawPadCanvas::selectPage(Page* page) | |||
332 | m_pageBackups.clear(); | 356 | m_pageBackups.clear(); |
333 | m_pageBackups.append(new Page(*(m_pages.current()))); | 357 | m_pageBackups.append(new Page(*(m_pages.current()))); |
334 | 358 | ||
335 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 359 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
336 | viewport()->update(); | 360 | viewport()->update(); |
337 | 361 | ||
338 | emit pagesChanged(); | 362 | emit pagesChanged(); |
339 | emit pageBackupsChanged(); | 363 | emit pageBackupsChanged(); |
340 | } | 364 | } |
341 | 365 | ||
342 | void DrawPadCanvas::backupPage() | 366 | void DrawPadCanvas::backupPage() |
343 | { | 367 | { |
344 | QPixmap* currentBackup = m_pageBackups.current(); | 368 | m_pages.current()->setLastModified(QDateTime::currentDateTime()); |
369 | |||
370 | Page* currentBackup = m_pageBackups.current(); | ||
345 | while (m_pageBackups.last() != currentBackup) { | 371 | while (m_pageBackups.last() != currentBackup) { |
346 | m_pageBackups.removeLast(); | 372 | m_pageBackups.removeLast(); |
347 | } | 373 | } |
348 | 374 | ||
349 | while (m_pageBackups.count() >= (5 + 1)) { | 375 | while (m_pageBackups.count() >= (5 + 1)) { |
350 | m_pageBackups.removeFirst(); | 376 | m_pageBackups.removeFirst(); |
351 | } | 377 | } |
352 | 378 | ||
353 | m_pageBackups.append(new Page(*(m_pages.current()))); | 379 | m_pageBackups.append(new Page(*(m_pages.current()))); |
354 | 380 | ||
355 | emit pageBackupsChanged(); | 381 | emit pageBackupsChanged(); |
356 | } | 382 | } |
357 | 383 | ||
358 | void DrawPadCanvas::deleteAll() | 384 | void DrawPadCanvas::deleteAll() |
359 | { | 385 | { |
360 | m_pages.clear(); | 386 | m_pages.clear(); |
361 | 387 | ||
362 | m_pages.append(new Page(contentsRect().size())); | 388 | m_pages.append(new Page("", contentsRect().size())); |
363 | m_pages.current()->fill(Qt::white); | 389 | m_pages.current()->fill(Qt::white); |
364 | 390 | ||
365 | m_pageBackups.clear(); | 391 | m_pageBackups.clear(); |
366 | m_pageBackups.append(new Page(*(m_pages.current()))); | 392 | m_pageBackups.append(new Page(*(m_pages.current()))); |
367 | 393 | ||
368 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 394 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
369 | viewport()->update(); | 395 | viewport()->update(); |
370 | 396 | ||
371 | emit pagesChanged(); | 397 | emit pagesChanged(); |
372 | emit pageBackupsChanged(); | 398 | emit pageBackupsChanged(); |
373 | } | 399 | } |
374 | 400 | ||
375 | void DrawPadCanvas::newPage(uint width, uint height, const QColor& color) | 401 | void DrawPadCanvas::newPage(QString title, uint width, uint height, const QColor& color) |
376 | { | 402 | { |
377 | m_pages.insert(m_pages.at() + 1, new Page(width, height)); | 403 | m_pages.insert(m_pages.at() + 1, new Page(title, width, height)); |
378 | m_pages.current()->fill(color); | 404 | m_pages.current()->fill(color); |
379 | 405 | ||
380 | m_pageBackups.clear(); | 406 | m_pageBackups.clear(); |
381 | m_pageBackups.append(new Page(*(m_pages.current()))); | 407 | m_pageBackups.append(new Page(*(m_pages.current()))); |
382 | 408 | ||
383 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 409 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
384 | viewport()->update(); | 410 | viewport()->update(); |
385 | 411 | ||
386 | emit pagesChanged(); | 412 | emit pagesChanged(); |
387 | emit pageBackupsChanged(); | 413 | emit pageBackupsChanged(); |
388 | } | 414 | } |
389 | 415 | ||
@@ -396,25 +422,25 @@ void DrawPadCanvas::clearPage() | |||
396 | 422 | ||
397 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 423 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
398 | viewport()->update(); | 424 | viewport()->update(); |
399 | 425 | ||
400 | emit pageBackupsChanged(); | 426 | emit pageBackupsChanged(); |
401 | } | 427 | } |
402 | 428 | ||
403 | void DrawPadCanvas::deletePage() | 429 | void DrawPadCanvas::deletePage() |
404 | { | 430 | { |
405 | m_pages.remove(m_pages.current()); | 431 | m_pages.remove(m_pages.current()); |
406 | 432 | ||
407 | if (m_pages.isEmpty()) { | 433 | if (m_pages.isEmpty()) { |
408 | m_pages.append(new Page(contentsRect().size())); | 434 | m_pages.append(new Page("", contentsRect().size())); |
409 | m_pages.current()->fill(Qt::white); | 435 | m_pages.current()->fill(Qt::white); |
410 | } | 436 | } |
411 | 437 | ||
412 | m_pageBackups.clear(); | 438 | m_pageBackups.clear(); |
413 | m_pageBackups.append(new Page(*(m_pages.current()))); | 439 | m_pageBackups.append(new Page(*(m_pages.current()))); |
414 | 440 | ||
415 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 441 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
416 | viewport()->update(); | 442 | viewport()->update(); |
417 | 443 | ||
418 | emit pagesChanged(); | 444 | emit pagesChanged(); |
419 | emit pageBackupsChanged(); | 445 | emit pageBackupsChanged(); |
420 | } | 446 | } |