git-svn-id: svn://db.shs.com.ru/libs@260 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2017-08-09 08:21:43 +00:00
parent 28420cccc5
commit 24c04aa44a
4 changed files with 29 additions and 16 deletions

View File

@@ -6,7 +6,7 @@
#include <QPixmap>
#include <QMouseEvent>
#include <QComboBox>
#include <QMutex>
///#include <QMutex>
#include <QDebug>
#include <QGridLayout>
#include <QFileDialog>
@@ -208,10 +208,11 @@ public:
QWidget * viewport() const {return canvas;}
QByteArray save();
void load(QByteArray ba);
void lock() {mutex_.lock();}
void unlock() {mutex_.unlock();}
///void lock() {mutex_.lock();}
///void unlock() {mutex_.unlock();}
void reset() {mutex.lock(); clear(); mutex.unlock();}
///void reset() {mutex.lock(); clear(); mutex.unlock();}
void reset() {clear();}
GraphicType graphic(int arg) {if (arg < 0 || arg >= graphics.size()) return GraphicType(); return graphics[arg];}
const QVector<GraphicType> & allGraphics() const {return graphics;}
@@ -362,7 +363,7 @@ protected:
QPair<QString, QString> gridMark(double v) const;
Ui::Graphic * ui;
QMutex mutex, mutex_;
///QMutex mutex, mutex_;
QWidget * canvas;
QImage * buffer;
QPainter * painter;