Skip to content

Commit 751b6b1

Browse files
author
Nicolai Waniek
committed
Merge branch 'master' of github.com:Elv13/qt5-node-editor into elv13-master
2 parents e2021c0 + 81958af commit 751b6b1

20 files changed

+554
-73
lines changed

.travis.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
dist: trusty
2+
sudo: required
3+
language: cpp
4+
5+
# build matrix
6+
7+
os:
8+
- osx
9+
- linux
10+
11+
compiler:
12+
- g++
13+
- clang
14+
15+
env:
16+
- BUILD_TYPE=Debug
17+
- BUILD_TYPE=Release
18+
19+
matrix:
20+
exclude:
21+
os: osx
22+
compiler: g++
23+
24+
before_install:
25+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install qt cmake; fi
26+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq && sudo apt-get install cmake qtbase5-dev; fi
27+
28+
install:
29+
- mkdir build
30+
- cd build
31+
- cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
32+
- make

src/graphicsbezieredge.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ GraphicsDirectedEdge(QNodeEditorEdgeModel* m, const QModelIndex& index, qreal fa
5858
d_ptr->_pen.setWidth(2);
5959
d_ptr->m_pGrpahicsItem->setZValue(-1);
6060

61+
#if 0
6162
d_ptr->_effect->setBlurRadius(15.0);
6263
d_ptr->_effect->setColor(QColor("#99050505"));
6364
d_ptr->m_pGrpahicsItem->setGraphicsEffect(d_ptr->_effect);
65+
#endif
6466
}
6567

6668
void GraphicsDirectedEdge::update()
@@ -85,7 +87,9 @@ graphicsItem() const
8587
GraphicsDirectedEdge::
8688
~GraphicsDirectedEdge()
8789
{
90+
#if 0
8891
delete d_ptr->_effect;
92+
#endif
8993
delete d_ptr->m_pGrpahicsItem;
9094
delete d_ptr;
9195
}

src/graphicsbezieredge_p.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ class GraphicsDirectedEdgePrivate final
1313
explicit GraphicsDirectedEdgePrivate(GraphicsDirectedEdge* q) : q_ptr(q) {}
1414

1515
//TODO support effect lazy loading
16+
#if 0
1617
QGraphicsDropShadowEffect *_effect {new QGraphicsDropShadowEffect()};
18+
#endif
1719

1820
QPen _pen {QColor("#00FF00")};
1921
QPointF _start;

0 commit comments

Comments
 (0)