SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2018-05-28 11:32:30 +00:00
parent 31557d5e5c
commit f2581cd605
12 changed files with 237 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
qcd_utils/pult/cdgraphics.cpp
View File

@@ -1,4 +1,5 @@
#include "cdgraphics.h"
#include "ui_cdgraphic.h"
#include "cdutils_core.h"
#include "cdutils_x.h"
#include "qcd_core.h"
@@ -46,8 +47,8 @@ GDockWidget::GDockWidget(QString title, QMainWindow * p): QDockWidget(title, p)
menu_x = new QMenu(this);
menu_x->setTitle(trUtf8("Remove X"));
graphic = new CDGraphicWidget();
graphic->graphic->viewport()->setAcceptDrops(true);
graphic->graphic->viewport()->installEventFilter(this);
graphic->graphic()->viewport()->setAcceptDrops(true);
graphic->graphic()->viewport()->installEventFilter(this);
setWidget(graphic);
}
@@ -57,9 +58,9 @@ void GDockWidget::addX(const CDType & t) {
PIDeque<int> xp = t.path();
if (x_list.contains(xp)) return;
x_list << xp;
int gind = graphic->graphic->graphicsCount();
graphic->graphic->setGraphicsCount(gind + 1);
graphic->graphic->setGraphicName(PI2QString(t.pathString().join(".")), gind);
int gind = graphic->graphic()->graphicsCount();
graphic->graphic()->setGraphicsCount(gind + 1);
graphic->graphic()->setGraphicName(PI2QString(t.pathString().join(".")), gind);
}
@@ -68,9 +69,9 @@ void GDockWidget::drawX(const PIMap<PIString, PIVector<double> > & data) {
PIString sp = CDCore::pathToString(x_list[i]);
const PIVector<double> & ch(data[sp]);
for (int j = 0; j < ch.size_s(); ++j)
graphic->graphic->addPoint(ch[j], i, false);
graphic->graphic()->addPoint(ch[j], i, false);
}
graphic->graphic->updateGraphics();
graphic->graphic()->updateGraphics();
}
@@ -78,9 +79,9 @@ QByteArray GDockWidget::save() const {
ChunkStream cs;
cs.add(1, windowTitle())
.add(2, getList(x_list))
.add(3, graphic->graphic->save())
.add(4, graphic->evalHistory->expression())
.add(5, graphic->evalVisible->expression());
.add(3, graphic->graphic()->save())
.add(4, graphic->ui->evalHistory->expression())
.add(5, graphic->ui->evalVisible->expression());
return cs.data();
}
@@ -92,9 +93,9 @@ void GDockWidget::load(QByteArray ba) {
switch (cs.read()) {
case 1: setWindowTitle(cs.getData<QString>()); break;
case 2: x_list = setList(cs.getData<QStringList>()); break;
case 3: graphic->graphic->load(cs.getData<QByteArray>()); break;
case 4: graphic->evalHistory->setExpression(cs.getData<QString>()); break;
case 5: graphic->evalVisible->setExpression(cs.getData<QString>()); break;
case 3: graphic->graphic()->load(cs.getData<QByteArray>()); break;
case 4: graphic->ui->evalHistory->setExpression(cs.getData<QString>()); break;
case 5: graphic->ui->evalVisible->setExpression(cs.getData<QString>()); break;
default: break;
}
}
@@ -132,13 +133,13 @@ bool GDockWidget::eventFilter(QObject * o, QEvent * e) {
void GDockWidget::contextMenuEvent(QContextMenuEvent * e) {
if (graphic->graphic->underMouse()) return;
if (graphic->graphic()->underMouse()) return;
qDeleteAll(menu_x->actions());
menu_x->clear();
for (int i = 0; i < graphic->graphic->graphicsCount(); ++i) {
for (int i = 0; i < graphic->graphic()->graphicsCount(); ++i) {
QPixmap icon(da->iconSize());
icon.fill(graphic->graphic->graphic(i).pen.color());
QAction * a = new QAction(QIcon(icon), graphic->graphic->graphic(i).name, this);
icon.fill(graphic->graphic()->graphic(i).pen.color());
QAction * a = new QAction(QIcon(icon), graphic->graphic()->graphic(i).name, this);
a->setData(i);
connect(a, SIGNAL(triggered(bool)), this, SLOT(removeX()));
menu_x->addAction(a);
@@ -176,7 +177,7 @@ void GDockWidget::removeX() {
int ind = a->data().toInt();
if (ind < 0 || ind >= x_list.size_s()) return;
x_list.remove(ind);
graphic->graphic->removeGraphic(ind);
graphic->graphic()->removeGraphic(ind);
}
@@ -302,7 +303,7 @@ void CDGraphics::on_buttonAdd_clicked() {
void CDGraphics::on_buttonClear_clicked() {
foreach (GDockWidget * d, docks)
d->graphic->graphic->clear();
d->graphic->graphic()->clear();
}