From c383e65437514a0fff9943b997189b4ac539b579 Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sat, 14 May 2022 14:54:32 +0100 Subject: [PATCH] Fix printing Plots --- src/plot2D/Graph.cpp | 4 +- translations/makhber_cs.ts | 96 +++++++++++++++++------------------ translations/makhber_de.ts | 96 +++++++++++++++++------------------ translations/makhber_es.ts | 96 +++++++++++++++++------------------ translations/makhber_ja.ts | 96 +++++++++++++++++------------------ translations/makhber_pl.ts | 96 +++++++++++++++++------------------ translations/makhber_pt_BR.ts | 96 +++++++++++++++++------------------ translations/makhber_ru.ts | 96 +++++++++++++++++------------------ translations/makhber_sv.ts | 96 +++++++++++++++++------------------ translations/makhber_zh_CN.ts | 96 +++++++++++++++++------------------ translations/makhber_zh_TW.ts | 96 +++++++++++++++++------------------ 11 files changed, 483 insertions(+), 481 deletions(-) diff --git a/src/plot2D/Graph.cpp b/src/plot2D/Graph.cpp index 54e2458b6..919fcb7f6 100644 --- a/src/plot2D/Graph.cpp +++ b/src/plot2D/Graph.cpp @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -5255,7 +5256,8 @@ int Graph::mapToQwtAxis(int axis) void Graph::print(QPainter *painter, const QRect &plotRect) { - d_plot->print(painter, plotRect); + QwtPlotRenderer plotRenderer {}; + plotRenderer.render(d_plot, painter, QRectF(plotRect)); } void Graph::deselect() diff --git a/translations/makhber_cs.ts b/translations/makhber_cs.ts index 36e86439f..2860e6f99 100644 --- a/translations/makhber_cs.ts +++ b/translations/makhber_cs.ts @@ -7376,167 +7376,167 @@ p, li { white-space: pre-wrap; } Graph - + Internal Error Vnitřní chyba - - - - - + + + + + Error Chyba - + Couldn't change the axis type to the requested format! Formát popisu os se nepodařilo změnit na ten, který je požadován! - - + + Please provide a valid file name! Zadejte, prosím, platný název souboru! - + File format not handled, operation aborted! Tento souborový formát se nepodařilo zpracovat. Operace byla zrušena! - - - - + + + + Warning Varování - + Output in postscript format is not available for Qt5, using PDF Výstup ve formátu Postscript není dostupný pro Qt5. Používá se PDF - + Title Název - - + + File open error Chyba při otevírání souboru - - + + Image file: <p><b> %1 </b><p>does not exist anymore! Soubor s obrázkem: <p><b> %1 </b><p> již neexistuje! - + 1 curve data table x column name 1 - + 2 curve data table y column name 2 - + Data set generated from curve Záznam s údaji vytvořený z křivky - + Curve data %1 Údaje ke křivce %1 - + The columns Sloupce - + are empty and will not be added to the plot! jsou prázdné a nebudou do nákresu přidány! - + The column Sloupec - + is empty and will not be added to the plot! je prázdný a nebude do nákresu přidán! - - + + &Cut &Vyjmout - - + + &Copy &Kopírovat - - + + &Delete &Smazat - - - - - - + + + + + + &Properties... &Vlastnosti... - + &Rescale to show all &Změnit měřítko pohledu na Ukázat vše - + Ctrl+Shift+R Ctrl+Shift+R - + &Hide axis &Skrýt osu - + &Show grids &Ukázat mřížky - + &Scale... &Skala... - + There are no curves available on this plot! Nejsou zde žádné křivky, které by byly dostupné pro tento nákres! - + There are no curves with more than two points on this plot. Operation aborted! V tomto nákresu nejsou žádné křivky, které by měly více než dva body. Operace zrušena! @@ -7546,7 +7546,7 @@ p, li { white-space: pre-wrap; } F - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> diff --git a/translations/makhber_de.ts b/translations/makhber_de.ts index e90f7d2d3..99afc58a8 100644 --- a/translations/makhber_de.ts +++ b/translations/makhber_de.ts @@ -7372,172 +7372,172 @@ p, li { white-space: pre-wrap; } Graph - + Internal Error Interner Fehler - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> - - - - - + + + + + Error Fehler - + Couldn't change the axis type to the requested format! Konnte Format der Achsenbeschriftung nicht auf das angeforderte Format setzen! - - + + Please provide a valid file name! Bitte einen gültigen Dateinamen eingeben! - + File format not handled, operation aborted! Dateiformat konnte nicht verarbeitet werden, Operation abgebrochen! - - - - + + + + Warning Warnung - + Output in postscript format is not available for Qt5, using PDF - + Title Titel - - + + File open error Fehler beim Öffnen der Datei - - + + Image file: <p><b> %1 </b><p>does not exist anymore! Die Bilddatei: <p><b> %1 </b><p> existiert nicht mehr! - + 1 curve data table x column name 1 - + 2 curve data table y column name 2 - + Data set generated from curve Aus der Kurve generierter Datensatz - + Curve data %1 Kurvendaten %1 - + The columns Die Spalten - + are empty and will not be added to the plot! sind leer und werden nicht zum Diagramm hinzugefügt! - + The column Die Spalte - + is empty and will not be added to the plot! ist leer und wird nicht zum Diagramm hinzugefügt! - - + + &Cut &Ausschneiden - - + + &Copy &Kopieren - - + + &Delete &Löschen - - - - - - + + + + + + &Properties... &Eigenschaften... - + &Rescale to show all Auf Komplettansicht &reskalieren - + Ctrl+Shift+R Ctrl+Shift+R - + &Hide axis Achse &verbergen - + &Show grids Gitter &anzeigen - + &Scale... &Skala... - + There are no curves available on this plot! In diesem Diagramm existieren keine Kurven! - + There are no curves with more than two points on this plot. Operation aborted! Es gibt keine Kurven mit mehr als 2 Punkten in diesem Diagramm. Operation abgebrochen! diff --git a/translations/makhber_es.ts b/translations/makhber_es.ts index 604a89aa0..ae69de0f6 100644 --- a/translations/makhber_es.ts +++ b/translations/makhber_es.ts @@ -7397,172 +7397,172 @@ p, li { white-space: pre-wrap; } Graph - + Internal Error Error interno - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> - - - - - + + + + + Error Error - + Couldn't change the axis type to the requested format! No se pudo cambiar el tipo de eje al formato requerido! - - + + Please provide a valid file name! ¡Por favor, introduzca un nombre válido de archivo! - + File format not handled, operation aborted! Formato de archivo no soportado, ¡operación abortada! - - - - + + + + Warning Atención - + Output in postscript format is not available for Qt5, using PDF - + Title Título - - + + File open error Error de apertura de archivo - - + + Image file: <p><b> %1 </b><p>does not exist anymore! ¡El archivo de imagen: <p><b> %1 </b><p> ya no existe! - + 1 curve data table x column name 1 - + 2 curve data table y column name 2 - + Data set generated from curve Conjunto de datos generados a partir de la curva - + Curve data %1 Datos de curva %1 - + The columns Las columnas - + are empty and will not be added to the plot! están vacías y no serán añadidas al gráfico! - + The column La columna - + is empty and will not be added to the plot! está vacía y no será añadida al gráfico! - - + + &Cut &Cortar - - + + &Copy &Copiar - - + + &Delete &Eliminar - - - - - - + + + + + + &Properties... &Propiedades... - + &Rescale to show all &Reescalar para mostrar todo - + Ctrl+Shift+R Ctrl+Shift+R - + &Hide axis &Ocultar eje - + &Show grids Mo&strar mallas - + &Scale... E&scala... - + There are no curves available on this plot! ¡No hay curvas disponibles en este gráfico! - + There are no curves with more than two points on this plot. Operation aborted! No hay curvas con más de dos puntos en este gráfico. ¡Operación abortada! diff --git a/translations/makhber_ja.ts b/translations/makhber_ja.ts index b4ed803e4..e0fa1f633 100644 --- a/translations/makhber_ja.ts +++ b/translations/makhber_ja.ts @@ -7361,172 +7361,172 @@ p, li { white-space: pre-wrap; } Graph - + Internal Error - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> - - - - - + + + + + Error - + Couldn't change the axis type to the requested format! - - + + Please provide a valid file name! - + File format not handled, operation aborted! - - - - + + + + Warning - + Output in postscript format is not available for Qt5, using PDF - + Title - - + + File open error - - + + Image file: <p><b> %1 </b><p>does not exist anymore! - + 1 curve data table x column name - + 2 curve data table y column name - + Data set generated from curve - + Curve data %1 - + The columns - + are empty and will not be added to the plot! - + The column - + is empty and will not be added to the plot! - - + + &Cut - - + + &Copy - - + + &Delete - - - - - - + + + + + + &Properties... - + &Rescale to show all 全体表示可能にリサイズ(&R) - + Ctrl+Shift+R - + &Hide axis - + &Show grids - + &Scale... - + There are no curves available on this plot! - + There are no curves with more than two points on this plot. Operation aborted! diff --git a/translations/makhber_pl.ts b/translations/makhber_pl.ts index 6f8bba5d0..08732bd46 100644 --- a/translations/makhber_pl.ts +++ b/translations/makhber_pl.ts @@ -7403,172 +7403,172 @@ p, li { white-space: pre-wrap; } Graph - + Internal Error Błąd Wewnętrzny - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> - - - - - + + + + + Error Błąd - + Couldn't change the axis type to the requested format! Nie można zmienić typu osi na wybrany format! - - + + Please provide a valid file name! Proszę podać prawidłową nazwę pliku! - + File format not handled, operation aborted! Nieobsługiwany format pliku, czynność wstrzymano! - - - - + + + + Warning Ostrzeżenie - + Output in postscript format is not available for Qt5, using PDF - + Title Tytuł - - + + File open error Błąd otwarcia pliku - - + + Image file: <p><b> %1 </b><p>does not exist anymore! Plik obrazu: <p><b> %1 </b><p>już nie istnieje! - + 1 curve data table x column name - + 2 curve data table y column name - + Data set generated from curve Dane wygenerowane z krzywej - + Curve data %1 Dane krzywej %1 - + The columns Kolumny - + are empty and will not be added to the plot! są puste i nie będą dodane do wykresu! - + The column Kolumna - + is empty and will not be added to the plot! jest pusta i nie będzie dodana do wykresu! - - + + &Cut &Wytnij - - + + &Copy &Kopiuj - - + + &Delete &Usuń - - - - - - + + + + + + &Properties... &Właściwości... - + &Rescale to show all &Przeskaluj by pokazać wszystko - + Ctrl+Shift+R - + &Hide axis &Ukryj oś - + &Show grids &Pokaż siatkę - + &Scale... &Skala... - + There are no curves available on this plot! Na tym wykresie brak krzywych! - + There are no curves with more than two points on this plot. Operation aborted! Na tym wykresie brak krzywych o więcej niż dwóch punktach. Czynność wstrzymano! diff --git a/translations/makhber_pt_BR.ts b/translations/makhber_pt_BR.ts index 50894d8c7..a2eafd947 100644 --- a/translations/makhber_pt_BR.ts +++ b/translations/makhber_pt_BR.ts @@ -7407,167 +7407,167 @@ p, li { white-space: pre-wrap; } Graph - + Internal Error Erro interno - - - - - + + + + + Error Erro - + Couldn't change the axis type to the requested format! Não foi possível alterar o tipo de eixo para o formato solicitado! - - + + Please provide a valid file name! Por favor, forneça um nome de arquivo válido! - + File format not handled, operation aborted! Formato de arquivo não suportado. Operação abortada! - - - - + + + + Warning Atenção - + Output in postscript format is not available for Qt5, using PDF Saída no formato postscript não está disponível para Qt5, utilizando PDF - + Title Título - - + + File open error Erro na abertura de arquivo - - + + Image file: <p><b> %1 </b><p>does not exist anymore! O arquivo de imagem: <p><b> %1 </b><p> não existe mais! - + 1 curve data table x column name 1 - + 2 curve data table y column name 2 - + Data set generated from curve Conjunto de dados gerados a partir da curva - + Curve data %1 Dados da curva %1 - + The columns As colunas - + are empty and will not be added to the plot! estão vazias e não serão adicionadas ao gráfico! - + The column A coluna - + is empty and will not be added to the plot! está vazia e não será adicionada ao gráfico! - - + + &Cut &Cortar - - + + &Copy C&opiar - - + + &Delete &Remover - - - - - - + + + + + + &Properties... Propriedades... - + &Rescale to show all &Reescalar para mostrar tudo - + Ctrl+Shift+R Ctrl+Shift+R - + &Hide axis &Ocultar eixo - + &Show grids Mo&strar grades - + &Scale... Escala... - + There are no curves available on this plot! Não existem curvas disponíveis neste gráfico! - + There are no curves with more than two points on this plot. Operation aborted! Não existem curvas com mais de dois pontos neste gráfico. Operação abortada! @@ -7577,7 +7577,7 @@ p, li { white-space: pre-wrap; } F - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> diff --git a/translations/makhber_ru.ts b/translations/makhber_ru.ts index 93631d29d..748421ccf 100644 --- a/translations/makhber_ru.ts +++ b/translations/makhber_ru.ts @@ -7402,172 +7402,172 @@ p, li { white-space: pre-wrap; } Graph - + Internal Error Внутренняя ошибка - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> - - - - - + + + + + Error Ошибка - + Couldn't change the axis type to the requested format! Не удалось изменить тип оси на требуемый формат! - - + + Please provide a valid file name! Пожалуйста, укажите корректное имя файла! - + File format not handled, operation aborted! Формат файла не обработан, операция прервана! - - - - + + + + Warning Предупреждение - + Output in postscript format is not available for Qt5, using PDF Вывод в формате postscript недоступен для Qt5 при использовании PDF - + Title Заголовок - - + + File open error Ошибка открытия файла - - + + Image file: <p><b> %1 </b><p>does not exist anymore! Файл изображения: <p><b> %1 </b><p>больше не существует! - + 1 curve data table x column name 1 - + 2 curve data table y column name 2 - + Data set generated from curve Набор данных, построенный по кривой - + Curve data %1 Данные кривой %1 - + The columns Столбцы - + are empty and will not be added to the plot! являются пустыми и их содержимое не может быть отображено на графике! - + The column Столбец - + is empty and will not be added to the plot! явлется пустой и её содержимое не может быть отображено на графике! - - + + &Cut &Вырезать - - + + &Copy &Копировать - - + + &Delete &Удалить - - - - - - + + + + + + &Properties... &Свойства... - + &Rescale to show all &Перерисовать и отобразить всё - + Ctrl+Shift+R Ctrl+Shift+R - + &Hide axis &Скрыть оси - + &Show grids &Показать сетку - + &Scale... &Масштаб... - + There are no curves available on this plot! На данном графике нет доступных кривых! - + There are no curves with more than two points on this plot. Operation aborted! На данном графике нет кривых с более чем двумя точками. Операция прервана! diff --git a/translations/makhber_sv.ts b/translations/makhber_sv.ts index 8efa30eb9..a67964abd 100644 --- a/translations/makhber_sv.ts +++ b/translations/makhber_sv.ts @@ -7368,171 +7368,171 @@ p, li { white-space: pre-wrap; } Graph - + Title Titel - - + + Image file: <p><b> %1 </b><p>does not exist anymore! Bildfil: <p><b> %1 </b><p> finns inte längre! - + Internal Error - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> - + Couldn't change the axis type to the requested format! - - + + Please provide a valid file name! - + File format not handled, operation aborted! - - + + File open error - + Data set generated from curve - + Curve data %1 - - - - + + + + Warning - + Output in postscript format is not available for Qt5, using PDF - + The columns Kolumnerna - + are empty and will not be added to the plot! är tomma och kommer ej att läggas till diagrammet! - + The column Kolumnen - + is empty and will not be added to the plot! är tom och kommer ej att läggas till diagrammet! - - + + &Cut Klipp &ut - - + + &Copy &Kopiera - - + + &Delete &Tag bort - - - - - - + + + + + + &Properties... &Egenskaper... - + &Rescale to show all Skala om fö&r att visa allt - + Ctrl+Shift+R Ctrl+Shift+R - + &Hide axis &Dölj axlar - + &Show grids &Visa rutnät - + &Scale... &Skala... - + There are no curves available on this plot! Det finns inga kurvor tillgängliga på detta diagram! - + There are no curves with more than two points on this plot. Operation aborted! Det finns inga kurvor med mer än två punkter i detta diagram. Åtgärd avbruten! - - - - - + + + + + Error Fel - + 1 curve data table x column name 1 - + 2 curve data table y column name 2 diff --git a/translations/makhber_zh_CN.ts b/translations/makhber_zh_CN.ts index 277b42374..db18c111f 100644 --- a/translations/makhber_zh_CN.ts +++ b/translations/makhber_zh_CN.ts @@ -7408,164 +7408,164 @@ p, li { white-space: pre-wrap; } Graph - - - - - + + + + + Error 错误 - + Couldn't change the axis type to the requested format! 不能将轴类型转换为请求格式！ - - + + Please provide a valid file name! 请提供有效的文件名！ - + File format not handled, operation aborted! 无法处理的文件格式，操作终止！ - - - - + + + + Warning 警告 - + Output in postscript format is not available for Qt5, using PDF 使用 PDF，Qt5 无法使用 postscript 格式输出 - + Title 标题 - - + + Image file: <p><b> %1 </b><p>does not exist anymore! 图像文件<p><b> %1 </b><p>不再存在！ - - + + File open error 文件打开错误 - + 1 curve data table x column name 曲线数据表 x 列的名称 1 - + 2 curve data table y column name 曲线数据表 y 列的名称 2 - + Data set generated from curve 从曲线生成的数据集 - + Curve data %1 曲线数据 %1 - + The columns 列 - + are empty and will not be added to the plot! 是空的并且不会被添加到绘图中！ - + The column 列 - + is empty and will not be added to the plot! 是空的并且不会被添加到绘图中！ - - + + &Cut 剪切(&C) - - + + &Copy 复制(&C) - - + + &Delete 删除(&D) - - - - - - + + + + + + &Properties... 属性(&P)... - + &Rescale to show all 重缩放显示所有(&R) - + Ctrl+Shift+R Ctrl+Shift+R - + &Hide axis 隐藏轴(&H) - + &Show grids 显示网格(&S) - + &Scale... 比例(&S)... - + There are no curves available on this plot! 此绘图中没有有效曲线！ - + There are no curves with more than two points on this plot. Operation aborted! 此绘图中没有包含多于两个点的曲线。操作终止！ @@ -7575,12 +7575,12 @@ p, li { white-space: pre-wrap; } F - + Internal Error - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html> diff --git a/translations/makhber_zh_TW.ts b/translations/makhber_zh_TW.ts index 03405ef52..3668bd533 100644 --- a/translations/makhber_zh_TW.ts +++ b/translations/makhber_zh_TW.ts @@ -7408,164 +7408,164 @@ p, li { white-space: pre-wrap; } Graph - - - - - + + + + + Error 錯誤 - + Couldn't change the axis type to the requested format! 不能將軸類型轉換為請求格式！ - - + + Please provide a valid file name! 請提供有效的檔案名！ - + File format not handled, operation aborted! 無法處理的檔格式，操作終止！ - - - - + + + + Warning 警告 - + Output in postscript format is not available for Qt5, using PDF 使用 PDF，Qt5 無法使用 postscript 格式輸出 - + Title 標題 - - + + Image file: <p><b> %1 </b><p>does not exist anymore! 圖像檔<p><b> %1 </b><p>不再存在！ - - + + File open error 檔打開錯誤 - + 1 curve data table x column name 曲線資料表 x 列的名稱 1 - + 2 curve data table y column name 曲線資料表 y 列的名稱 2 - + Data set generated from curve 從曲線生成的資料集 - + Curve data %1 曲線資料 %1 - + The columns 列 - + are empty and will not be added to the plot! 是空的並且不會被添加到繪圖中！ - + The column 列 - + is empty and will not be added to the plot! 是空的並且不會被添加到繪圖中！ - - + + &Cut 剪切(&C) - - + + &Copy 複製(&C) - - + + &Delete 刪除(&D) - - - - - - + + + + + + &Properties... 屬性(&P)... - + &Rescale to show all 重縮放顯示所有(&R) - + Ctrl+Shift+R Ctrl+Shift+R - + &Hide axis 隱藏軸(&H) - + &Show grids 顯示網格(&S) - + &Scale... 比例(&S)... - + There are no curves available on this plot! 此繪圖中沒有有效曲線！ - + There are no curves with more than two points on this plot. Operation aborted! 此繪圖中沒有包含多於兩個點的曲線。操作終止！ @@ -7575,12 +7575,12 @@ p, li { white-space: pre-wrap; } F - + Internal Error - + <html>Failed to set axis labels on Graph %1. Maybe you're trying to open a corrupted project file; or there's some problem within Makhber. Please report this as a bug (together with detailed instructions how to reproduce this message or the corrupted file).<p><a href="https://github.com/Makhber/makhber/issues>">bug tracker: https://github.com/Makhber/makhber/issues</a></html>