diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index 44c59783a..eb065c0d5 100755 --- a/builds/linux/obs/PKGBUILD +++ b/builds/linux/obs/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 19, 2020 # Copyright (C) 2017 - 2023 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.6.3380 +pkgver=2.4.6.3381 pkgrel=1 pkgdesc="An LDraw Building Instruction Editor" url="https://github.com/trevorsandy/lpub3d.git" diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index 0cc6d4419..821e248aa 100644 --- a/builds/linux/obs/alldeps/PKGBUILD +++ b/builds/linux/obs/alldeps/PKGBUILD @@ -2,7 +2,7 @@ # Last Update: July 19, 2020 # Copyright (C) 2017 - 2023 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.6.3380 +pkgver=2.4.6.3381 pkgrel=1 pkgdesc="An LDraw Building Instruction Editor" url="https://github.com/trevorsandy/lpub3d.git" diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog index d3daafc81..c177b60e1 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3380) debian; urgency=medium +lpub3d (2.4.6.3381) debian; urgency=medium - * LPub3D version 2.4.6.269.3380_20230528 for Linux + * LPub3D version 2.4.6.270.3381_20230528 for Linux - -- Trevor SANDY Sun, 28 May 2023 18:20:48 +0200 + -- Trevor SANDY Sun, 28 May 2023 18:22:50 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 8dcc7f3e8..f77d2e63f 100644 --- a/builds/linux/obs/alldeps/debian/lpub3d.dsc +++ b/builds/linux/obs/alldeps/debian/lpub3d.dsc @@ -2,7 +2,7 @@ Format: 1.0 Source: lpub3d Binary: lpub3d Architecture: any -Version: 2.4.6.3380 +Version: 2.4.6.3381 Maintainer: Trevor SANDY Homepage: https://trevorsandy.github.io/lpub3d/ Standards-Version: 3.9.7 diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec index 490ad9048..12c542f27 100644 --- a/builds/linux/obs/alldeps/lpub3d.spec +++ b/builds/linux/obs/alldeps/lpub3d.spec @@ -120,7 +120,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.6.3380 +Version: 2.4.6.3381 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -797,7 +797,7 @@ update-desktop-database || true %endif %changelog -* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3380 +* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3381 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670 diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog index bb671cd9a..afc41bf3f 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3380) debian; urgency=medium +lpub3d (2.4.6.3381) debian; urgency=medium - * LPub3D version 2.4.6.269.3380_20230528 for Linux + * LPub3D version 2.4.6.270.3381_20230528 for Linux - -- Trevor SANDY Sun, 28 May 2023 18:20:50 +0200 + -- Trevor SANDY Sun, 28 May 2023 18:22:52 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 0176df2f8..7913a104e 100755 --- a/builds/linux/obs/debian/lpub3d.dsc +++ b/builds/linux/obs/debian/lpub3d.dsc @@ -2,7 +2,7 @@ Format: 1.0 Source: lpub3d Binary: lpub3d Architecture: any -Version: 2.4.6.3380 +Version: 2.4.6.3381 Maintainer: Trevor SANDY Homepage: https://trevorsandy.github.io/lpub3d/ Standards-Version: 3.9.7 diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec index cee57958d..3258039e7 100755 --- a/builds/linux/obs/lpub3d.spec +++ b/builds/linux/obs/lpub3d.spec @@ -82,7 +82,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.6.3380 +Version: 2.4.6.3381 Release: 1%{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -313,7 +313,7 @@ update-desktop-database || true %endif %changelog -* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3380 +* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3381 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670 diff --git a/builds/utilities/version.info b/builds/utilities/version.info index 03f9a2cc8..657543b3d 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 269 3380 5a5ea35ab +2 4 6 270 3381 d540c6e85 diff --git a/gitversion.pri b/gitversion.pri index 5e8065078..d037751bc 100644 --- a/gitversion.pri +++ b/gitversion.pri @@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) { # Check if we do not have a valid version number (i.e. no version tag found) isEmpty(GIT_VERSION) { - GIT_REVISION = 269 + GIT_REVISION = 270 GIT_SHA = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE) GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE) GIT_VERSION = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA} @@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) { # Get commit count GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE) isEmpty(GIT_COMMIT) { - GIT_COMMIT = 3380 + GIT_COMMIT = 3381 message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~") } @@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) { GIT_VERSION = $$cat($$GIT_VER_FILE, lines) } else { message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~") - GIT_VERSION = $${VERSION}.269.3380.5a5ea35ab + GIT_VERSION = $${VERSION}.270.3381.d540c6e85 message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~") GIT_VERSION ~= s/\./" " } diff --git a/mainApp/blenderpreferences.cpp b/mainApp/blenderpreferences.cpp index 4f2681257..8113e5094 100644 --- a/mainApp/blenderpreferences.cpp +++ b/mainApp/blenderpreferences.cpp @@ -103,10 +103,10 @@ BlenderPreferences::BlenderSettings BlenderPreferences::mDefaultSettings [NUM_S /*27/1 LBL_CAMERA_BORDER_PERCENT */ {"cameraborderpercentage", "5.0", QObject::tr("Camera Border Percent"), QObject::tr("When positioning the camera, include a (percentage) border around the model in the render")}, /*28/2 LBL_DEFAULT_COLOUR */ {"defaultcolour", "16", QObject::tr("Default Colour"), QObject::tr("Sets the default part colour using LDraw colour code")}, /*29/3 LBL_GAPS_SIZE */ {"gapwidth", "0.01", QObject::tr("Gap Width"), QObject::tr("Amount of gap space between each part")}, - /*20/4 LBL_IMAGE_WIDTH */ {"resolutionwidth", "800", QObject::tr("Image Width"), QObject::tr("Sets the rendered image width in pixels - updated from current step on dialog open.")}, - /*31/5 LBL_IMAGE_HEIGHT */ {"resolutionheight", "600", QObject::tr("Image Height"), QObject::tr("Sets the rendered image height in pixels - updated from current step on dialog open.")}, + /*20/4 LBL_IMAGE_WIDTH */ {"resolutionwidth", "800", QObject::tr("Image Width"), QObject::tr("Sets the rendered image width in pixels - from current step image, label shows config setting.")}, + /*31/5 LBL_IMAGE_HEIGHT */ {"resolutionheight", "600", QObject::tr("Image Height"), QObject::tr("Sets the rendered image height in pixels - from current step image, label shows config setting.")}, /*32/6 LBL_IMAGE_SCALE */ {"scale", "0.02", QObject::tr("Image Scale"), QObject::tr("Sets the imported model scale (between .01 and 1.0). Scale is 1.0 and is huge and unwieldy in the viewport")}, - /*33/6 LBL_RENDER_PERCENTAGE */ {"renderpercentage", "100", QObject::tr("Render Percentage"), QObject::tr("Sets the rendered image percentage scale for its pixel resolution - updated from current step on dialog open.")}, + /*33/6 LBL_RENDER_PERCENTAGE */ {"renderpercentage", "100", QObject::tr("Render Percentage"), QObject::tr("Sets the rendered image percentage scale for its pixel resolution - updated from current step, label shows config setting.")}, /*34/0 LBL_COLOUR_SCHEME */ {"usecolourscheme", "lgeo", QObject::tr("Colour Scheme"), QObject::tr("Colour scheme options - Realistic (lgeo), Original (LDConfig), Alternate (LDCfgalt), Custom (User Defined)")}, @@ -179,9 +179,9 @@ BlenderPreferences::BlenderSettings BlenderPreferences::mDefaultSettingsMM [NUM /* 41/02 LBL_GAP_SCALE */ {"gapscale", "0.997", QObject::tr("Gap Scale"), QObject::tr("Scale individual parts by this much to create the gap")}, /* 42/03 LBL_IMPORT_SCALE */ {"importscale", "0.02", QObject::tr("Import Scale"), QObject::tr("What scale to import at. Full scale is 1.0 and is so huge that it is unwieldy in the viewport")}, /* 43/04 LBL_MERGE_DISTANCE */ {"mergedistance", "0.05", QObject::tr("Merge Distance"), QObject::tr("Maximum distance between elements to merge")}, - /* 44/05 LBL_RENDER_PERCENTAGE_MM */ {"renderpercentage", "100", QObject::tr("Render Percentage"), QObject::tr("Sets the rendered image percentage scale for its pixel resolution - updated from current step on dialog open.")}, - /* 45/06 LBL_RESOLUTION_WIDTH */ {"resolutionwidth", "800", QObject::tr("Image Width"), QObject::tr("Sets the rendered image width in pixels - updated from current step on dialog open.")}, - /* 46/07 LBL_RESOLUTION_HEIGHT */ {"resolutionheight", "600", QObject::tr("Image Height"), QObject::tr("Sets the rendered image height in pixels - updated from current step on dialog open.")}, + /* 44/05 LBL_RENDER_PERCENTAGE_MM */ {"renderpercentage", "100", QObject::tr("Render Percentage"), QObject::tr("Sets the rendered image percentage scale for its pixel resolution - updated from current step, label shows config setting.")}, + /* 45/06 LBL_RESOLUTION_WIDTH */ {"resolutionwidth", "800", QObject::tr("Image Width"), QObject::tr("Sets the rendered image width in pixels - from current step image, label shows config setting.")}, + /* 46/07 LBL_RESOLUTION_HEIGHT */ {"resolutionheight", "600", QObject::tr("Image Height"), QObject::tr("Sets the rendered image height in pixels - from current step image, label shows config setting.")}, /* 47/08 LBL_STARTING_STEP_FRAME */ {"startingstepframe", "1", QObject::tr("Starting Step Frame"), QObject::tr("Frame to add the first STEP meta command")}, /* 48/00 LBL_CHOSEN_LOGO */ {"chosenlogo", "logo3", QObject::tr("Chosen Logo"), QObject::tr("Which logo to display. logo and logo2 aren't used and are only included for completeness")}, @@ -277,8 +277,8 @@ bool BlenderPreferencesDialog::getBlenderPreferences( if (ok) { dialog->mPreferences->apply(ok); - width = dialog->mPreferences->mWidth; - height = dialog->mPreferences->mHeight; + width = dialog->mPreferences->mImageWidth; + height = dialog->mPreferences->mImageHeight; renderPercentage = dialog->mPreferences->mRenderPercentage; } @@ -337,8 +337,8 @@ BlenderPreferences::BlenderPreferences( mProcess = nullptr; #endif - mWidth = width; - mHeight = height; + mImageWidth = width; + mImageHeight = height; mRenderPercentage = renderPercentage; mDocumentRender = docRender; @@ -608,12 +608,7 @@ void BlenderPreferences::initPathsAndSettings() for(int i = 0; i < numSettings(); i++) { QLabel *label = new QLabel(mSettingsBox); - if (i == LBL_CROP_IMAGE) - label->setText(QString("%1 (%2 x %3)") - .arg(mBlenderSettings[i].label) - .arg(gui->GetImageWidth()).arg(gui->GetImageHeight())); - else - label->setText(mBlenderSettings[i].label); + label->setText(mBlenderSettings[i].label); label->setToolTip(mBlenderSettings[i].tooltip); mSettingLabelList << label; @@ -766,12 +761,7 @@ void BlenderPreferences::initPathsAndSettingsMM() for(int i = 0; i < numSettingsMM(); i++) { QLabel *label = new QLabel(mSettingsBox); - if (i == LBL_CROP_IMAGE_MM) - label->setText(QString("%1 (%2 x %3)") - .arg(mBlenderSettingsMM[i].label) - .arg(gui->GetImageWidth()).arg(gui->GetImageHeight())); - else - label->setText(mBlenderSettingsMM[i].label); + label->setText(mBlenderSettingsMM[i].label); label->setToolTip(mBlenderSettingsMM[i].tooltip); mSettingLabelList << label; @@ -1897,8 +1887,8 @@ bool BlenderPreferences::settingsModified(bool update, const QString &module) if (gAddonPreferences->mDialogCancelled) return false; - int &width = gAddonPreferences->mWidth; - int &height = gAddonPreferences->mHeight; + int &width = gAddonPreferences->mImageWidth; + int &height = gAddonPreferences->mImageHeight; double &renderPercentage = gAddonPreferences->mRenderPercentage; bool moduleMM = !module.isEmpty() @@ -2143,9 +2133,9 @@ void BlenderPreferences::resetSettings() } else if (i < LBL_COLOUR_SCHEME) { for(int j = 0; j < mLineEditList.size(); j++) { if (j == IMAGE_WIDTH_EDIT) - mLineEditList[j]->setText(QString::number(mWidth)); + mLineEditList[j]->setText(QString::number(mImageWidth)); else if (j == IMAGE_HEIGHT_EDIT) - mLineEditList[j]->setText(QString::number(mHeight)); + mLineEditList[j]->setText(QString::number(mImageHeight)); else if (j == RENDER_PERCENTAGE_EDIT) mLineEditList[j]->setText(QString::number(mRenderPercentage * 100)); else if (j == DEFAULT_COLOUR_EDIT) @@ -2188,9 +2178,9 @@ void BlenderPreferences::resetSettings() } else if (i < LBL_CHOSEN_LOGO) { for(int j = 0; j < mLineEditList.size(); j++) { if (j == RESOLUTION_WIDTH_EDIT) - mLineEditList[j]->setText(QString::number(mWidth)); + mLineEditList[j]->setText(QString::number(mImageWidth)); else if (j == RESOLUTION_HEIGHT_EDIT) - mLineEditList[j]->setText(QString::number(mHeight)); + mLineEditList[j]->setText(QString::number(mImageHeight)); else if (j == RENDER_PERCENTAGE_EDIT_MM) mLineEditList[j]->setText(QString::number(mRenderPercentage * 100)); else @@ -2296,8 +2286,8 @@ void BlenderPreferences::loadSettings() for (int i = 1/*skip blender executable*/; i < numPaths(); i++) { if (i == LBL_STUDIO_LDRAW_PATH) continue; - QString const key = QString("%1/%2").arg(IMPORTLDRAW, mBlenderPaths[i].key); - QString const value = Settings.value(key, QString()).toString(); + QString const &key = QString("%1/%2").arg(IMPORTLDRAW, mBlenderPaths[i].key); + QString const &value = Settings.value(key, QString()).toString(); if (QFileInfo(value).exists()) { mBlenderPaths[i].value = QDir::toNativeSeparators(value); } @@ -2306,27 +2296,35 @@ void BlenderPreferences::loadSettings() for (int i = 1/*skip blender executable*/; i < numPaths(); i++) { if (i == LBL_LSYNTH_PATH || i == LBL_STUD_LOGO_PATH) continue; - QString const key = QString("%1/%2").arg(IMPORTLDRAWMM, mBlenderPaths[i].key_mm); - QString const value = Settings.value(key, QString()).toString(); + QString const &key = QString("%1/%2").arg(IMPORTLDRAWMM, mBlenderPaths[i].key_mm); + QString const &value = Settings.value(key, QString()).toString(); if (QFileInfo(value).exists()) { mBlenderPaths[i].value = QDir::toNativeSeparators(value); } } for (int i = 0; i < numSettings(); i++) { - QString const key = QString("%1/%2").arg(IMPORTLDRAW, mBlenderSettings[i].key); - QString const value = Settings.value(key, QString()).toString(); + QString const &key = QString("%1/%2").arg(IMPORTLDRAW, mBlenderSettings[i].key); + QString const &value = Settings.value(key, QString()).toString(); if (!value.isEmpty()) { mBlenderSettings[i].value = value == "True" ? "1" : value == "False" ? "0" : value; } + if (i == LBL_IMAGE_WIDTH || i == LBL_IMAGE_HEIGHT || i == LBL_RENDER_PERCENTAGE) { + QString const &label = mDefaultSettings[i].label; + mBlenderSettings[i].label = QString("%1 - Setting (%2)").arg(label).arg(value); + } } for (int i = 0; i < numSettingsMM(); i++) { - QString const key = QString("%1/%2").arg(IMPORTLDRAWMM, mBlenderSettingsMM[i].key); - QString const value = Settings.value(key, QString()).toString(); + QString const &key = QString("%1/%2").arg(IMPORTLDRAWMM, mBlenderSettingsMM[i].key); + QString const &value = Settings.value(key, QString()).toString(); if (!value.isEmpty()) { mBlenderSettingsMM[i].value = value == "True" ? "1" : value == "False" ? "0" : value; } + if (i == LBL_RENDER_PERCENTAGE_MM || i == LBL_RESOLUTION_WIDTH || i == LBL_RESOLUTION_HEIGHT) { + QString const &label = mDefaultSettingsMM[i].label; + mBlenderSettingsMM[i].label = QString("%1 - Setting (%2)").arg(label).arg(value); + } } } else { QString const logFile = QString("%1/Blender/stdout-blender-addon-install").arg(Preferences::lpub3d3rdPartyConfigDir); @@ -2347,12 +2345,12 @@ void BlenderPreferences::loadSettings() } } - mBlenderSettings[LBL_IMAGE_WIDTH].value = QString::number(gAddonPreferences->mWidth); - mBlenderSettings[LBL_IMAGE_HEIGHT].value = QString::number(gAddonPreferences->mHeight); + mBlenderSettings[LBL_IMAGE_WIDTH].value = QString::number(gAddonPreferences->mImageWidth); + mBlenderSettings[LBL_IMAGE_HEIGHT].value = QString::number(gAddonPreferences->mImageHeight); mBlenderSettings[LBL_RENDER_PERCENTAGE].value = QString::number(gAddonPreferences->mRenderPercentage * 100); - mBlenderSettingsMM[LBL_RESOLUTION_WIDTH].value = QString::number(gAddonPreferences->mWidth); - mBlenderSettingsMM[LBL_RESOLUTION_HEIGHT].value = QString::number(gAddonPreferences->mHeight); + mBlenderSettingsMM[LBL_RESOLUTION_WIDTH].value = QString::number(gAddonPreferences->mImageWidth); + mBlenderSettingsMM[LBL_RESOLUTION_HEIGHT].value = QString::number(gAddonPreferences->mImageHeight); mBlenderSettingsMM[LBL_RENDER_PERCENTAGE_MM].value = QString::number(gAddonPreferences->mRenderPercentage * 100); mBlenderPaths[LBL_BLENDER_PATH].value = Preferences::blenderExe; @@ -2642,7 +2640,7 @@ void BlenderPreferences::sizeChanged(const QString &value) disconnect(mLineEditList[height_edit],SIGNAL(textChanged(const QString &)), this, SLOT (sizeChanged(const QString &))); - QString const height = QString::number(qRound(double(mHeight * mNewValue / mWidth))); + QString const height = QString::number(qRound(double(mImageHeight * mNewValue / mImageWidth))); mLineEditList[height_edit]->setText(height); if (importMM) { @@ -2659,7 +2657,7 @@ void BlenderPreferences::sizeChanged(const QString &value) disconnect(mLineEditList[width_edit],SIGNAL(textChanged(const QString &)), this, SLOT (sizeChanged(const QString &))); - QString const width = QString::number(qRound(double(mNewValue * mWidth / mHeight))); + QString const width = QString::number(qRound(double(mNewValue * mImageWidth / mImageHeight))); mLineEditList[width_edit]->setText(width); if (importMM) { @@ -2688,9 +2686,19 @@ void BlenderPreferences::setModelSize(bool update) const int keep_aspect_ratio = importMM ? KEEP_ASPECT_RATIO_BOX_MM : KEEP_ASPECT_RATIO_BOX; const int width_edit = importMM ? RESOLUTION_WIDTH_EDIT : IMAGE_WIDTH_EDIT; const int height_edit = importMM ? RESOLUTION_HEIGHT_EDIT : IMAGE_HEIGHT_EDIT; + const int crop_image_label = importMM ? LBL_CROP_IMAGE_MM : LBL_CROP_IMAGE; + + const int imageWidth = gui->GetImageWidth(); + const int imageHeight = gui->GetImageHeight(); const bool cropImage = mCheckBoxList[crop_image]->isChecked(); + QString const cropImageLabel = mSettingLabelList[crop_image_label]->text(); + mSettingLabelList[crop_image_label]->setText(QString("%1 (%2 x %3)") + .arg(cropImageLabel) + .arg(imageWidth) + .arg(imageHeight)); + if (cropImage) { bool conflict[3]; @@ -2725,8 +2733,8 @@ void BlenderPreferences::setModelSize(bool update) disconnect(mLineEditList[height_edit],SIGNAL(textChanged(const QString &)), this, SLOT (sizeChanged(const QString &))); - QString const width = QString::number(cropImage ? gui->GetImageWidth() : mWidth); - QString const height = QString::number(cropImage ? gui->GetImageHeight() : mHeight); + QString const width = QString::number(cropImage ? imageWidth : mImageWidth); + QString const height = QString::number(cropImage ? imageHeight : mImageHeight); mLineEditList[width_edit]->setText(width); mLineEditList[height_edit]->setText(height); diff --git a/mainApp/blenderpreferences.h b/mainApp/blenderpreferences.h index 1863b896e..ec8e651cb 100644 --- a/mainApp/blenderpreferences.h +++ b/mainApp/blenderpreferences.h @@ -99,8 +99,8 @@ class BlenderPreferences : public QWidget void apply(const int response = QDialog::Accepted); - int mWidth; - int mHeight; + int mImageWidth; + int mImageHeight; qreal mRenderPercentage; protected: diff --git a/mainApp/commonmenus.cpp b/mainApp/commonmenus.cpp index ef406ead7..4539cbcdf 100644 --- a/mainApp/commonmenus.cpp +++ b/mainApp/commonmenus.cpp @@ -4119,7 +4119,13 @@ void CommonMenus::setWhatsThis() " You can select how to reset addon settings.\n" " The choice is since last apply or system default.\n\n" " You can see the specific description of each setting\n" - " if you hover over the setting to display its tooltip.\n" + " if you hover over the setting to display its tooltip.\n\n" + " Image Width, Image Height and Render Percentage are\n" + " always updated from the current step model when the\n" + " this dialog is opened. These settngs can be manually\n" + " overridden, Also, when Crop Image is checked the\n" + " current step cropped image width and height is\n" + " calculated and and used\n\n" " Use the dialogue window scroll bar to access the\n" " complete selection of addon settings.%2\n") .arg(QLatin1String(VER_PRODUCTNAME_STR)) diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index 08d25c5fc..aec0b6f56 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.269.3380 (28 05 2023 18:20:50) +LPub3D 2.4.6.270.3381 (28 05 2023 18:22:52) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 65406ee82..f95c1e9da 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.269.3380 (28 05 2023 18:20:50)

+

LPub3D 2.4.6.270.3381 (28 05 2023 18:22:52)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index b24311247..410696ee3 100644 --- a/mainApp/extras/LPub3D_Npp_UDL.xml +++ b/mainApp/extras/LPub3D_Npp_UDL.xml @@ -14,8 +14,8 @@ ;; ;; Author......: Trevor SANDY ;; Name........: LPub3D_Npp_UDL.xml -;; Version.....: 2.4.6.269.3380 -;; Last Update.: Sun, 28 May 2023 18:20:50 +0200 +;; Version.....: 2.4.6.270.3381 +;; Last Update.: Sun, 28 May 2023 18:22:52 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY