songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small fixes

This commit is contained in:
Andreas Fabri 2008-10-01 11:12:27 +00:00
parent 1d795d747e
commit d2e8a745c8
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GraphicsView/demo/Circular_kernel_2/ArcsGraphicsItem.h
View File

@ -62,7 +62,8 @@ protected:
QRectF bounding_rect; QRectF bounding_rect;
QPen intersections_pen; QPen intersections_pen;
QPen input_pen; QPen input_pen;
Converter<CK> convert;
}; };
@ -115,7 +116,10 @@ ArcsGraphicsItem<CK>::paint(QPainter *painter,
Line_arc_2 la; Line_arc_2 la;
if(assign(cap_ui, *it)){ if(assign(cap_ui, *it)){
painterostream << cap_ui.first; QMatrix matrix = painter->matrix();
painter->resetMatrix();
painter->drawPoint(matrix.map(convert(cap_ui.first)));
painter->setMatrix(matrix);
}if(assign(ca, *it)){ }if(assign(ca, *it)){
painterostream << ca; painterostream << ca;
} else if(assign(la, *it)){ } else if(assign(la, *it)){
@ -150,7 +154,7 @@ ArcsGraphicsItem<CK>::updateBoundingBox()
} }
} }
} }
Converter<CK> convert;
prepareGeometryChange(); prepareGeometryChange();
bounding_rect = convert(bb); bounding_rect = convert(bb);
} }

3
GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp
View File

@ -291,9 +291,8 @@ int main(int argc, char **argv)
// Import resources from libCGALQt4. // Import resources from libCGALQt4.
// See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
Q_INIT_RESOURCE(File); Q_INIT_RESOURCE(File);
Q_INIT_RESOURCE(Triangulation_2);
Q_INIT_RESOURCE(Input); Q_INIT_RESOURCE(Input);
// Q_INIT_RESOURCE(Logos); Q_INIT_RESOURCE(CGAL);
MainWindow mainWindow; MainWindow mainWindow;
mainWindow.show(); mainWindow.show();

3
GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.ui
View File

@ -77,9 +77,9 @@
</property> </property>
<addaction name="separator" /> <addaction name="separator" />
<addaction name="actionClear" /> <addaction name="actionClear" />
<addaction name="actionLoadLineAndCircularArcs" />
<addaction name="separator" /> <addaction name="separator" />
<addaction name="actionQuit" /> <addaction name="actionQuit" />
<addaction name="actionLoadLineAndCircularArcs" />
</widget> </widget>
<widget class="QMenu" name="menuEdit" > <widget class="QMenu" name="menuEdit" >
<property name="title" > <property name="title" >
@ -197,7 +197,6 @@
<include location="Circular_kernel_2.qrc" /> <include location="Circular_kernel_2.qrc" />
<include location="../resources/CGAL.qrc" /> <include location="../resources/CGAL.qrc" />
<include location="../icons/File.qrc" /> <include location="../icons/File.qrc" />
<include location="../icons/Triangulation_2.qrc" />
<include location="../icons/Input.qrc" /> <include location="../icons/Input.qrc" />
</resources> </resources>
<connections/> <connections/>