mirror of https://github.com/CGAL/cgal
small fixes
This commit is contained in:
parent
1d795d747e
commit
d2e8a745c8
|
|
@ -62,7 +62,8 @@ protected:
|
|||
QRectF bounding_rect;
|
||||
|
||||
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;
|
||||
|
||||
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)){
|
||||
painterostream << ca;
|
||||
} else if(assign(la, *it)){
|
||||
|
|
@ -150,7 +154,7 @@ ArcsGraphicsItem<CK>::updateBoundingBox()
|
|||
}
|
||||
}
|
||||
}
|
||||
Converter<CK> convert;
|
||||
|
||||
prepareGeometryChange();
|
||||
bounding_rect = convert(bb);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -291,9 +291,8 @@ int main(int argc, char **argv)
|
|||
// Import resources from libCGALQt4.
|
||||
// See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
|
||||
Q_INIT_RESOURCE(File);
|
||||
Q_INIT_RESOURCE(Triangulation_2);
|
||||
Q_INIT_RESOURCE(Input);
|
||||
// Q_INIT_RESOURCE(Logos);
|
||||
Q_INIT_RESOURCE(CGAL);
|
||||
|
||||
MainWindow mainWindow;
|
||||
mainWindow.show();
|
||||
|
|
|
|||
|
|
@ -77,9 +77,9 @@
|
|||
</property>
|
||||
<addaction name="separator" />
|
||||
<addaction name="actionClear" />
|
||||
<addaction name="actionLoadLineAndCircularArcs" />
|
||||
<addaction name="separator" />
|
||||
<addaction name="actionQuit" />
|
||||
<addaction name="actionLoadLineAndCircularArcs" />
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuEdit" >
|
||||
<property name="title" >
|
||||
|
|
@ -197,7 +197,6 @@
|
|||
<include location="Circular_kernel_2.qrc" />
|
||||
<include location="../resources/CGAL.qrc" />
|
||||
<include location="../icons/File.qrc" />
|
||||
<include location="../icons/Triangulation_2.qrc" />
|
||||
<include location="../icons/Input.qrc" />
|
||||
</resources>
|
||||
<connections/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue