SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-09-22 08:15:35 +00:00
parent 1f6bf2ad33
commit 4d2491a6ff
6 changed files with 72 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qad/graphic/graphic.cpp
View File

@@ -66,7 +66,7 @@ Graphic::Graphic(QWidget * parent): QFrame(parent), line_x_min(this), line_x_max
connect(&line_x_max, SIGNAL(valueChanged(double)), this, SLOT(lineXMaxChanged(double))); connect(&line_x_max, SIGNAL(valueChanged(double)), this, SLOT(lineXMaxChanged(double)));
connect(&line_y_min, SIGNAL(valueChanged(double)), this, SLOT(lineYMinChanged(double))); connect(&line_y_min, SIGNAL(valueChanged(double)), this, SLOT(lineYMinChanged(double)));
connect(&line_y_max, SIGNAL(valueChanged(double)), this, SLOT(lineYMaxChanged(double))); connect(&line_y_max, SIGNAL(valueChanged(double)), this, SLOT(lineYMaxChanged(double)));
connect(ui->canvas_raster, SIGNAL(paintEvent(QPaintEvent * )), this, SLOT(canvasPaintEvent(QPaintEvent * ))); connect(ui->canvas_raster, SIGNAL(paintEvent(QPaintEvent * )), this, SLOT(canvasPaintEvent()));
connect(ui->canvas_raster, SIGNAL(mouseMoveEvent(QMouseEvent * )), this, SLOT(canvasMouseMoveEvent(QMouseEvent * ))); connect(ui->canvas_raster, SIGNAL(mouseMoveEvent(QMouseEvent * )), this, SLOT(canvasMouseMoveEvent(QMouseEvent * )));
connect(ui->canvas_raster, SIGNAL(mousePressEvent(QMouseEvent * )), this, SLOT(canvasMousePressEvent(QMouseEvent * ))); connect(ui->canvas_raster, SIGNAL(mousePressEvent(QMouseEvent * )), this, SLOT(canvasMousePressEvent(QMouseEvent * )));
connect(ui->canvas_raster, SIGNAL(mouseReleaseEvent(QMouseEvent * )), this, SLOT(canvasMouseReleaseEvent(QMouseEvent * ))); connect(ui->canvas_raster, SIGNAL(mouseReleaseEvent(QMouseEvent * )), this, SLOT(canvasMouseReleaseEvent(QMouseEvent * )));
@@ -74,7 +74,7 @@ Graphic::Graphic(QWidget * parent): QFrame(parent), line_x_min(this), line_x_max
connect(ui->canvas_raster, SIGNAL(wheelEvent(QWheelEvent * )), this, SLOT(canvasWheelEvent(QWheelEvent * ))); connect(ui->canvas_raster, SIGNAL(wheelEvent(QWheelEvent * )), this, SLOT(canvasWheelEvent(QWheelEvent * )));
connect(ui->canvas_raster, SIGNAL(leaveEvent(QEvent * )), this, SLOT(canvasLeaveEvent(QEvent * ))); connect(ui->canvas_raster, SIGNAL(leaveEvent(QEvent * )), this, SLOT(canvasLeaveEvent(QEvent * )));
connect(ui->canvas_raster, SIGNAL(keyPressEvent(QKeyEvent * )), this, SLOT(canvasKeyPressEvent(QKeyEvent * ))); connect(ui->canvas_raster, SIGNAL(keyPressEvent(QKeyEvent * )), this, SLOT(canvasKeyPressEvent(QKeyEvent * )));
connect(ui->canvas_gl, SIGNAL(paintEvent(QPaintEvent * )), this, SLOT(canvasPaintEvent(QPaintEvent * ))); connect(ui->canvas_gl, SIGNAL(paintSignal()), this, SLOT(canvasPaintEvent()));
connect(ui->canvas_gl, SIGNAL(mouseMoveEvent(QMouseEvent * )), this, SLOT(canvasMouseMoveEvent(QMouseEvent * ))); connect(ui->canvas_gl, SIGNAL(mouseMoveEvent(QMouseEvent * )), this, SLOT(canvasMouseMoveEvent(QMouseEvent * )));
connect(ui->canvas_gl, SIGNAL(mousePressEvent(QMouseEvent * )), this, SLOT(canvasMousePressEvent(QMouseEvent * ))); connect(ui->canvas_gl, SIGNAL(mousePressEvent(QMouseEvent * )), this, SLOT(canvasMousePressEvent(QMouseEvent * )));
connect(ui->canvas_gl, SIGNAL(mouseReleaseEvent(QMouseEvent * )), this, SLOT(canvasMouseReleaseEvent(QMouseEvent * ))); connect(ui->canvas_gl, SIGNAL(mouseReleaseEvent(QMouseEvent * )), this, SLOT(canvasMouseReleaseEvent(QMouseEvent * )));
@@ -191,7 +191,7 @@ void Graphic::procGesture(QGesture * g) {
} }
void Graphic::canvasPaintEvent(QPaintEvent * ) { void Graphic::canvasPaintEvent() {
if (is_lines_update) return; if (is_lines_update) return;
//QMutexLocker ml(&mutex_); //QMutexLocker ml(&mutex_);
//static int pwid = 0, phei = 0; //static int pwid = 0, phei = 0;
@@ -853,7 +853,7 @@ void Graphic::drawAction() {
void Graphic::drawGrid() { void Graphic::drawGrid() {
int gbx = gridborder.x(), gby = gridborder.y(), cwid = painter->viewport().width(), chei = painter->viewport().height() - legy; int gbx = gridborder.x(), gby = gridborder.y(), cwid = canvas->width(), chei = canvas->height() - legy;
double px, py, range, step, start; double px, py, range, step, start;
int wid = cwid - gbx - 5, hei = chei - gby - 5, cx, cy, cnt; int wid = cwid - gbx - 5, hei = chei - gby - 5, cx, cy, cnt;
QRect rect; QRect rect;
@@ -1016,7 +1016,7 @@ void Graphic::drawGraphics() {
if (isHover) if (isHover)
ui->status->setText(tr("Cursor: ") + pointCoords(canvas2real(QPointF(curpos)))); ui->status->setText(tr("Cursor: ") + pointCoords(canvas2real(QPointF(curpos))));
QPointF srp = -selrect.topLeft(), cp; QPointF srp = -selrect.topLeft(), cp;
double sclx, scly, wid = painter->viewport().width(), hei = painter->viewport().height() - legy, pw; double sclx, scly, wid = canvas->width(), hei = canvas->height() - legy, pw;
sclx = (wid - gridborder.x() - margins_.left() - margins_.width()) / selrect.width(); sclx = (wid - gridborder.x() - margins_.left() - margins_.width()) / selrect.width();
scly = (hei - gridborder.y() - margins_.top() - margins_.height()) / selrect.height(); scly = (hei - gridborder.y() - margins_.top() - margins_.height()) / selrect.height();
painter->setClipping(true); painter->setClipping(true);

2
qad/graphic/graphic.h
View File

@@ -394,7 +394,7 @@ protected:
bool hasLblX, hasLblY, navigation, only_expand_y, only_expand_x, is_lines_update, leg_update, visible_update, fullscr; bool hasLblX, hasLblY, navigation, only_expand_y, only_expand_x, is_lines_update, leg_update, visible_update, fullscr;
protected slots: protected slots:
void canvasPaintEvent(QPaintEvent * ); void canvasPaintEvent();
void canvasMouseMoveEvent(QMouseEvent * ); void canvasMouseMoveEvent(QMouseEvent * );
void canvasMousePressEvent(QMouseEvent * ); void canvasMousePressEvent(QMouseEvent * );
void canvasMouseReleaseEvent(QMouseEvent * ); void canvasMouseReleaseEvent(QMouseEvent * );

6
qad/graphic/qpicalculator/mainwindow.cpp
View File

@@ -16,7 +16,7 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow()
epal.setColor(lineInput->backgroundRole(), QColor(Qt::red).lighter(150)); epal.setColor(lineInput->backgroundRole(), QColor(Qt::red).lighter(150));
connect(&session, SIGNAL(loading(QPIConfig & )), this, SLOT(loading(QPIConfig & ))); connect(&session, SIGNAL(loading(QPIConfig & )), this, SLOT(loading(QPIConfig & )));
connect(&session, SIGNAL(saving(QPIConfig & )), this, SLOT(saving(QPIConfig & ))); connect(&session, SIGNAL(saving(QPIConfig & )), this, SLOT(saving(QPIConfig & )));
session.setFile("session.conf"); session.setFile("session_qpicalc.conf");
session.addEntry(this); session.addEntry(this);
session.addEntry(lineInput); session.addEntry(lineInput);
session.addEntry(tabWidget); session.addEntry(tabWidget);
@@ -105,6 +105,9 @@ void MainWindow::loading(QPIConfig & conf) {
} }
buttonGraphicClear->setEnabled(treeGraphics->topLevelItemCount() > 0); buttonGraphicClear->setEnabled(treeGraphics->topLevelItemCount() > 0);
graphic->setVisualRect(conf.getValue("graphicRect", QRectF(-1., -1., 2., 2.))); graphic->setVisualRect(conf.getValue("graphicRect", QRectF(-1., -1., 2., 2.)));
ba = conf.getValue("graphic_state", QByteArray());
if (!ba.isEmpty())
graphic->load(ba);
on_tabWidget_currentChanged(0); on_tabWidget_currentChanged(0);
redrawGraphics(); redrawGraphics();
active_ = true; active_ = true;
@@ -130,6 +133,7 @@ void MainWindow::saving(QPIConfig & conf) {
s << graphic->allGraphics(); s << graphic->allGraphics();
conf.setValue("graphics", QByteArray2QString(ba)); conf.setValue("graphics", QByteArray2QString(ba));
conf.setValue("graphicRect", graphic->visualRect()); conf.setValue("graphicRect", graphic->visualRect());
conf.setValue("graphic_state", graphic->save());
} }

52
qad/graphic/qpicalculator/mainwindow.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>780</width> <width>780</width>
<height>492</height> <height>521</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -22,7 +22,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@@ -32,7 +32,16 @@
<property name="spacing"> <property name="spacing">
<number>2</number> <number>2</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
@@ -120,7 +129,16 @@
<property name="spacing"> <property name="spacing">
<number>2</number> <number>2</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
@@ -166,7 +184,7 @@
<item> <item>
<widget class="QToolButton" name="buttonVarAdd"> <widget class="QToolButton" name="buttonVarAdd">
<property name="icon"> <property name="icon">
<iconset resource="qpicalculator.qrc"> <iconset resource="../../utils/qad_utils.qrc">
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset> <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -183,7 +201,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="qpicalculator.qrc"> <iconset resource="../../utils/qad_utils.qrc">
<normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset> <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -219,7 +237,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="qpicalculator.qrc"> <iconset resource="../../utils/qad_utils.qrc">
<normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset> <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -255,7 +273,16 @@
<property name="spacing"> <property name="spacing">
<number>2</number> <number>2</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
@@ -313,7 +340,7 @@
<item> <item>
<widget class="QToolButton" name="buttonGraphicAdd"> <widget class="QToolButton" name="buttonGraphicAdd">
<property name="icon"> <property name="icon">
<iconset resource="qpicalculator.qrc"> <iconset resource="../../utils/qad_utils.qrc">
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset> <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -330,7 +357,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="qpicalculator.qrc"> <iconset resource="../../utils/qad_utils.qrc">
<normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset> <normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -366,7 +393,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="qpicalculator.qrc"> <iconset resource="../../utils/qad_utils.qrc">
<normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset> <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@@ -402,7 +429,7 @@
<item> <item>
<widget class="Graphic" name="graphic"> <widget class="Graphic" name="graphic">
<property name="buttons"> <property name="buttons">
<set>Graphic::BorderInputs|Graphic::Configure|Graphic::CursorAxis|Graphic::Grid|Graphic::Save</set> <set>Graphic::BorderInputs|Graphic::Configure|Graphic::CursorAxis|Graphic::Fullscreen|Graphic::Grid|Graphic::Save</set>
</property> </property>
<property name="antialiasing"> <property name="antialiasing">
<bool>true</bool> <bool>true</bool>
@@ -436,6 +463,7 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../utils/qad_utils.qrc"/>
<include location="qpicalculator.qrc"/> <include location="qpicalculator.qrc"/>
</resources> </resources>
<connections/> <connections/>

31
qad/graphic/uglwidget.h
View File

@@ -2,6 +2,7 @@
#define UGLWIDGET_H #define UGLWIDGET_H
#include <QWidget> #include <QWidget>
#include <QDebug>
#if QT_VERSION >= 0x050400 #if QT_VERSION >= 0x050400
# include <QOpenGLWidget> # include <QOpenGLWidget>
typedef QOpenGLWidget __GLWidget__; typedef QOpenGLWidget __GLWidget__;
@@ -18,13 +19,29 @@ class UGLWidget: public __GLWidget__
{ {
Q_OBJECT Q_OBJECT
public: public:
UGLWidget(QWidget * parent = 0): __GLWidget__(/*QGLFormat(QGL::DoubleBuffer | QGL::AlphaChannel | QGL::DirectRendering | QGL::SampleBuffers),*/ parent) {} #if QT_VERSION >= 0x050400
UGLWidget(QWidget * parent = 0): __GLWidget__(parent) {QSurfaceFormat sf = format(); sf.setSamples(8); setFormat(sf);}
#else
UGLWidget(QWidget * parent = 0): __GLWidget__(QGLFormat(QGL::DoubleBuffer | QGL::AlphaChannel | QGL::DirectRendering | QGL::SampleBuffers), parent) {}
#endif
//UGLWidget(QGLContext * context, QWidget * parent = 0): __GLWidget__(context, parent) {} //UGLWidget(QGLContext * context, QWidget * parent = 0): __GLWidget__(context, parent) {}
#if QT_VERSION >= 0x050400 #if QT_VERSION >= 0x050400
QImage grabFrameBuffer() {return grabFramebuffer();} QImage grabFrameBuffer() {return grabFramebuffer();}
#endif #endif
protected:
#if QT_VERSION >= 0x050400
virtual void paintGL() {emit paintSignal();}
#else
virtual void paintEvent(QPaintEvent * ) {emit paintSignal();}
#endif
virtual void resizeEvent(QResizeEvent * e) {
__GLWidget__::resizeEvent(e);
emit resizeSignal();
}
signals: signals:
void closeEvent(QCloseEvent * e); void closeEvent(QCloseEvent * e);
void dragEnterEvent(QDragEnterEvent * e); void dragEnterEvent(QDragEnterEvent * e);
@@ -41,18 +58,10 @@ signals:
void mousePressEvent(QMouseEvent * e); void mousePressEvent(QMouseEvent * e);
void mouseReleaseEvent(QMouseEvent * e); void mouseReleaseEvent(QMouseEvent * e);
void moveEvent(QMoveEvent * e); void moveEvent(QMoveEvent * e);
void resizeEvent(QResizeEvent * e);
void showEvent(QShowEvent * e); void showEvent(QShowEvent * e);
void wheelEvent(QWheelEvent * e); void wheelEvent(QWheelEvent * e);
void paintEvent(QPaintEvent * e); void resizeSignal();
void glDraw(); void paintSignal();
void glInit();
void initializeGL();
void initializeOverlayGL();
void paintGL();
void paintOverlayGL();
void resizeGL(int width, int height);
void resizeOverlayGL(int width, int height);
}; };

2
qad/graphic/uwidget.h
View File

@@ -12,7 +12,7 @@ class UWidget: public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
UWidget(QWidget * parent = 0): QWidget(parent) {}; UWidget(QWidget * parent = 0): QWidget(parent) {}
private: private:
virtual bool event(QEvent * e) { virtual bool event(QEvent * e) {