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

QPIConfig file write fix

Browse Source
This commit is contained in:
Пелипенко Иван
2021-12-24 14:40:31 +03:00
parent 93ffd99b0c
commit fcdc142991
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/graphic/graphic.cpp
View File

@@ -1306,6 +1306,7 @@ void Graphic::drawGraphics() {
lod = qBound<int>(0, qFloor(log2(ppp) - 1), src_lod.size()); lod = qBound<int>(0, qFloor(log2(ppp) - 1), src_lod.size());
//qDebug() << "draw lod" << lod << src_lod[lod - 1].size(); //qDebug() << "draw lod" << lod << src_lod[lod - 1].size();
} }
t.last_lod = lod;
QPolygonF & rpol(lod == 0 ? src_pol : src_lod[lod - 1]); QPolygonF & rpol(lod == 0 ? src_pol : src_lod[lod - 1]);
int ind_start = -1, ind_end = -1; int ind_start = -1, ind_end = -1;
if (m_LODOptimization) { if (m_LODOptimization) {
@@ -1393,8 +1394,11 @@ void Graphic::drawGuides() {
str = pointCoords(rpos) + fp_size; str = pointCoords(rpos) + fp_size;
auto trace_axis_func = [&](bool on_x, double cursor) { auto trace_axis_func = [&](bool on_x, double cursor) {
if (curTrace >= 0 && curTrace < graphics.size()) { if (curTrace >= 0 && curTrace < graphics.size()) {
if (graphics[curTrace].visible) { auto & t(graphics[curTrace]);
QPolygonF & pol(pause_ ? graphics[curTrace].polyline_pause : graphics[curTrace].polyline); if (t.visible) {
QPolygonF & src_pol(pause_ ? t.polyline_pause : t.polyline);
QVector<QPolygonF> & src_lod(pause_ ? t._lod_pause : t._lod);
QPolygonF & pol(t.last_lod == 0 ? src_pol : src_lod[t.last_lod - 1]);
double min_dist = -1, dist = 0.; double min_dist = -1, dist = 0.;
int index = -1; int index = -1;
for (int i = 0; i < pol.size(); ++i) { for (int i = 0; i < pol.size(); ++i) {
@@ -1419,8 +1423,11 @@ void Graphic::drawGuides() {
int gr = -1, mag_dist = fontHeight(this) * 2; int gr = -1, mag_dist = fontHeight(this) * 2;
QPointF point, scale = getScale(), dp; QPointF point, scale = getScale(), dp;
for (int g = 0; g < graphics.size(); ++g) { for (int g = 0; g < graphics.size(); ++g) {
if (graphics[g].visible) { auto & t(graphics[g]);
QPolygonF & pol(pause_ ? graphics[g].polyline_pause : graphics[g].polyline); if (t.visible) {
QPolygonF & src_pol(pause_ ? t.polyline_pause : t.polyline);
QVector<QPolygonF> & src_lod(pause_ ? t._lod_pause : t._lod);
QPolygonF & pol(t.last_lod == 0 ? src_pol : src_lod[t.last_lod - 1]);
double dist = 0.; double dist = 0.;
for (int i = 0; i < pol.size(); ++i) { for (int i = 0; i < pol.size(); ++i) {
point = pol[i]; point = pol[i];

1
libs/graphic/graphic_conf.h
View File

@@ -68,6 +68,7 @@ struct QAD_GRAPHIC_EXPORT GraphicType {
QIcon icon; QIcon icon;
bool visible; bool visible;
QRectF cvrect; QRectF cvrect;
int last_lod = 0;
}; };

4
libs/utils/qpiconfig.cpp
View File

@@ -606,6 +606,10 @@ void QPIConfig::writeAll() {
stream.setString(buffer); stream.setString(buffer);
buffer->clear(); buffer->clear();
} }
#if QT_VERSION_MAJOR <= 5
if (!codec.isEmpty())
stream.setCodec(codec.toLatin1().data());
#endif
stream.seek(0); stream.seek(0);
buildFullNames(&root); buildFullNames(&root);
Branch b = allLeaves(); Branch b = allLeaves();

2
utils/qpicalculator/mainwindow.ui
View File

@@ -337,7 +337,7 @@
</widget> </widget>
<widget class="Graphic" name="graphic"> <widget class="Graphic" name="graphic">
<property name="buttons"> <property name="buttons">
<set>Graphic::BorderInputs|Graphic::Configure|Graphic::CursorAxis|Graphic::Fullscreen|Graphic::Grid|Graphic::Save</set> <set>Graphic::BorderInputs|Graphic::Configure|Graphic::CursorAxis|Graphic::Export|Graphic::Fullscreen|Graphic::Grid|Graphic::Save</set>
</property> </property>
<property name="antialiasing"> <property name="antialiasing">
<bool>true</bool> <bool>true</bool>