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

Graphic more accuracy when save *.csv

Browse Source
This commit is contained in:
Пелипенко Иван
2024-02-22 17:12:48 +03:00
parent 18526cdf29
commit 12f0603413
4 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/graphic/graphic.cpp
View File

@@ -1189,13 +1189,13 @@ void Graphic::exportGraphics(QString filename, QChar decimal_point, bool view_on
if (func_gridMarkX) { if (func_gridMarkX) {
line += func_gridMarkX(g.polyline[ind].x()).replace('.', decimal_point); line += func_gridMarkX(g.polyline[ind].x()).replace('.', decimal_point);
} else { } else {
line += QString::number(g.polyline[ind].x(), 'g', 9).replace('.', decimal_point); line += QString::number(g.polyline[ind].x(), 'g', 15).replace('.', decimal_point);
} }
line += ";"; line += ";";
if (func_gridMarkY) { if (func_gridMarkY) {
line += func_gridMarkY(g.polyline[ind].y()).replace('.', decimal_point); line += func_gridMarkY(g.polyline[ind].y()).replace('.', decimal_point);
} else { } else {
line += QString::number(g.polyline[ind].y(), 'g', 9).replace('.', decimal_point); line += QString::number(g.polyline[ind].y(), 'g', 12).replace('.', decimal_point);
} }
} }
++ind; ++ind;

2
libs/graphic/graphic.ui
View File

@@ -343,7 +343,7 @@
<item> <item>
<widget class="QToolButton" name="graphic_buttonSaveMenu"> <widget class="QToolButton" name="graphic_buttonSaveMenu">
<property name="toolTip"> <property name="toolTip">
<string>Save image ...</string> <string>Save ...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../blockview/qad_blockview.qrc"> <iconset resource="../blockview/qad_blockview.qrc">

68
libs/graphic/lang/qad_graphic_en.ts
View File

@@ -13,6 +13,11 @@
<source>Cursor axis</source> <source>Cursor axis</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../graphic.ui" line="346"/>
<source>Save ...</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../graphic.ui" line="435"/> <location filename="../graphic.ui" line="435"/>
<source>Free</source> <source>Free</source>
@@ -54,11 +59,6 @@
<source>Configure ...</source> <source>Configure ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../graphic.ui" line="346"/>
<source>Save image ...</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<location filename="../graphic.ui" line="477"/> <location filename="../graphic.ui" line="477"/>
<source>Save to Image ...</source> <source>Save to Image ...</source>
@@ -116,97 +116,97 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="479"/> <location filename="../graphic.cpp" line="481"/>
<location filename="../graphic.cpp" line="1708"/> <location filename="../graphic.cpp" line="1722"/>
<source>Cursor: </source> <source>Cursor: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="492"/> <location filename="../graphic.cpp" line="494"/>
<source>Selection</source> <source>Selection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="492"/> <location filename="../graphic.cpp" line="494"/>
<source>Size</source> <source>Size</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="499"/> <location filename="../graphic.cpp" line="501"/>
<location filename="../graphic.cpp" line="507"/> <location filename="../graphic.cpp" line="509"/>
<source>Range</source> <source>Range</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="500"/> <location filename="../graphic.cpp" line="502"/>
<location filename="../graphic.cpp" line="508"/> <location filename="../graphic.cpp" line="510"/>
<source>Length</source> <source>Length</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="613"/> <location filename="../graphic.cpp" line="615"/>
<location filename="../graphic.cpp" line="669"/> <location filename="../graphic.cpp" line="671"/>
<source>Cursor</source> <source>Cursor</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1141"/> <location filename="../graphic.cpp" line="1146"/>
<location filename="../graphic.cpp" line="1695"/> <location filename="../graphic.cpp" line="1703"/>
<source>Export graphics</source> <source>Export graphics</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1141"/> <location filename="../graphic.cpp" line="1146"/>
<source>Can`t open file &quot;%1&quot;!</source> <source>Can`t open file &quot;%1&quot;!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1676"/> <location filename="../graphic.cpp" line="1684"/>
<source>ms</source> <source>ms</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1676"/> <location filename="../graphic.cpp" line="1684"/>
<source>s</source> <source>s</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1676"/> <location filename="../graphic.cpp" line="1684"/>
<source>m</source> <source>m</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1676"/> <location filename="../graphic.cpp" line="1684"/>
<source>h</source> <source>h</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="2333"/> <location filename="../graphic.cpp" line="2347"/>
<source>Save Image</source> <source>Save Image</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1264"/> <location filename="../graphic.cpp" line="1270"/>
<source>y(x)</source> <source>y(x)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1701"/> <location filename="../graphic.cpp" line="1709"/>
<source>Select decimal point</source> <source>Select decimal point</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1701"/> <location filename="../graphic.cpp" line="1709"/>
<source>Decimal point:</source> <source>Decimal point:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="2359"/> <location filename="../graphic.cpp" line="2373"/>
<source>Save GIF</source> <source>Save GIF</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="2433"/> <location filename="../graphic.cpp" line="2440"/>
<source>Check all</source> <source>Check all</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -384,32 +384,32 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>NoPen</source> <source>NoPen</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Solid</source> <source>Solid</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Dash</source> <source>Dash</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Dot</source> <source>Dot</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Dash-Dot</source> <source>Dash-Dot</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Dash-Dot-Dot</source> <source>Dash-Dot-Dot</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

66
libs/graphic/lang/qad_graphic_ru.ts
View File

@@ -17,6 +17,11 @@
<source>Cursor axis</source> <source>Cursor axis</source>
<translation>Плавающие оси</translation> <translation>Плавающие оси</translation>
</message> </message>
<message>
<location filename="../graphic.ui" line="346"/>
<source>Save ...</source>
<translation>Сохранить ...</translation>
</message>
<message> <message>
<location filename="../graphic.ui" line="435"/> <location filename="../graphic.ui" line="435"/>
<source>Free</source> <source>Free</source>
@@ -67,9 +72,8 @@
<translation>Настроить ...</translation> <translation>Настроить ...</translation>
</message> </message>
<message> <message>
<location filename="../graphic.ui" line="346"/>
<source>Save image ...</source> <source>Save image ...</source>
<translation>Сохранить изображение ...</translation> <translation type="vanished">Сохранить изображение ...</translation>
</message> </message>
<message> <message>
<location filename="../graphic.ui" line="477"/> <location filename="../graphic.ui" line="477"/>
@@ -144,97 +148,97 @@
<translation type="vanished">Свободная трассировка</translation> <translation type="vanished">Свободная трассировка</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="479"/> <location filename="../graphic.cpp" line="481"/>
<location filename="../graphic.cpp" line="1708"/> <location filename="../graphic.cpp" line="1722"/>
<source>Cursor: </source> <source>Cursor: </source>
<translation>Курсор: </translation> <translation>Курсор: </translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="492"/> <location filename="../graphic.cpp" line="494"/>
<source>Selection</source> <source>Selection</source>
<translation>Выделение</translation> <translation>Выделение</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="492"/> <location filename="../graphic.cpp" line="494"/>
<source>Size</source> <source>Size</source>
<translation>Размер</translation> <translation>Размер</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="499"/> <location filename="../graphic.cpp" line="501"/>
<location filename="../graphic.cpp" line="507"/> <location filename="../graphic.cpp" line="509"/>
<source>Range</source> <source>Range</source>
<translation>Диапазон</translation> <translation>Диапазон</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="500"/> <location filename="../graphic.cpp" line="502"/>
<location filename="../graphic.cpp" line="508"/> <location filename="../graphic.cpp" line="510"/>
<source>Length</source> <source>Length</source>
<translation>Длина</translation> <translation>Длина</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="613"/> <location filename="../graphic.cpp" line="615"/>
<location filename="../graphic.cpp" line="669"/> <location filename="../graphic.cpp" line="671"/>
<source>Cursor</source> <source>Cursor</source>
<translation>Курсор</translation> <translation>Курсор</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1141"/> <location filename="../graphic.cpp" line="1146"/>
<location filename="../graphic.cpp" line="1695"/> <location filename="../graphic.cpp" line="1703"/>
<source>Export graphics</source> <source>Export graphics</source>
<translation>Экспорт графиков</translation> <translation>Экспорт графиков</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1141"/> <location filename="../graphic.cpp" line="1146"/>
<source>Can`t open file &quot;%1&quot;!</source> <source>Can`t open file &quot;%1&quot;!</source>
<translation>Невозможно открыть файл &quot;%1&quot;!</translation> <translation>Невозможно открыть файл &quot;%1&quot;!</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1676"/> <location filename="../graphic.cpp" line="1684"/>
<source>ms</source> <source>ms</source>
<translation>мс</translation> <translation>мс</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1676"/> <location filename="../graphic.cpp" line="1684"/>
<source>s</source> <source>s</source>
<translation>сек</translation> <translation>сек</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1676"/> <location filename="../graphic.cpp" line="1684"/>
<source>m</source> <source>m</source>
<translation>мин</translation> <translation>мин</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1676"/> <location filename="../graphic.cpp" line="1684"/>
<source>h</source> <source>h</source>
<translation>ч</translation> <translation>ч</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="2333"/> <location filename="../graphic.cpp" line="2347"/>
<source>Save Image</source> <source>Save Image</source>
<translation>Сохранить изображение</translation> <translation>Сохранить изображение</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1264"/> <location filename="../graphic.cpp" line="1270"/>
<source>y(x)</source> <source>y(x)</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1701"/> <location filename="../graphic.cpp" line="1709"/>
<source>Select decimal point</source> <source>Select decimal point</source>
<translation>Выберите десятичный разделитель</translation> <translation>Выберите десятичный разделитель</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="1701"/> <location filename="../graphic.cpp" line="1709"/>
<source>Decimal point:</source> <source>Decimal point:</source>
<translation>Десятичный разделитель:</translation> <translation>Десятичный разделитель:</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="2359"/> <location filename="../graphic.cpp" line="2373"/>
<source>Save GIF</source> <source>Save GIF</source>
<translation>Сохранить GIF</translation> <translation>Сохранить GIF</translation>
</message> </message>
<message> <message>
<location filename="../graphic.cpp" line="2433"/> <location filename="../graphic.cpp" line="2440"/>
<source>Check all</source> <source>Check all</source>
<translation>Выбрать все</translation> <translation>Выбрать все</translation>
</message> </message>
@@ -416,32 +420,32 @@
<translation>Верхнее:</translation> <translation>Верхнее:</translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>NoPen</source> <source>NoPen</source>
<translation>НетЛинии</translation> <translation>НетЛинии</translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Solid</source> <source>Solid</source>
<translation>Сплошная</translation> <translation>Сплошная</translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Dash</source> <source>Dash</source>
<translation>Штриховая</translation> <translation>Штриховая</translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Dot</source> <source>Dot</source>
<translation>Пунктирная</translation> <translation>Пунктирная</translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Dash-Dot</source> <source>Dash-Dot</source>
<translation>ШтрихПунктирная</translation> <translation>ШтрихПунктирная</translation>
</message> </message>
<message> <message>
<location filename="../graphic_conf.cpp" line="46"/> <location filename="../graphic_conf.cpp" line="59"/>
<source>Dash-Dot-Dot</source> <source>Dash-Dot-Dot</source>
<translation>ШтрихПунктирПунктирная</translation> <translation>ШтрихПунктирПунктирная</translation>
</message> </message>