Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-12-25 21:58:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Blender addon - studio custom parts path

Browse source
This commit is contained in:
Trevor SANDY 2024-06-11 03:20:06 +02:00
parent 8e8337f604
commit 7ede24b3cc
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/lc_blenderpreferences.cpp
View file

@ -106,12 +106,13 @@ lcBlenderPreferences::BlenderPaths lcBlenderPreferences::mDefaultPaths [NUM_PAT
/* Key: MM Key: Value: Label: Tooltip (Description):*/
/* 0 PATH_BLENDER */ {"blenderpath", "blenderpath", "", QObject::tr("Blender Path"), QObject::tr("Full file path to Blender application executable")},
/* 1 PATH_BLENDFILE */ {"blendfile", "blendfile", "", QObject::tr("Blendfile Path"), QObject::tr("Full file path to a supplement .blend file - specify to append additional settings")},
/* 2. PATH_ENVIRONMENT */ {"environmentfile", "environmentfile", "", QObject::tr("Environment Texture Path"), QObject::tr("Full file path to .exr environment texture file - specify if not using default bundled in addon")},
/* 2 PATH_ENVIRONMENT */ {"environmentfile", "environmentfile", "", QObject::tr("Environment Texture Path"), QObject::tr("Full file path to .exr environment texture file - specify if not using default bundled in addon")},
/* 3 PATH_LDCONFIG */ {"customldconfigfile", "customldconfigfile", "", QObject::tr("Custom LDConfig Path"), QObject::tr("Full file path to custom LDConfig file - specify if not %1 alternate LDConfig file").arg(LC_PRODUCTNAME_STR)},
/* 4 PATH_LDRAW */ {"ldrawdirectory", "ldrawpath", "", QObject::tr("LDraw Directory"), QObject::tr("Full directory path to the LDraw parts library (download from https://library.ldraw.org)")},
/* 5 PATH_LSYNTH */ {"lsynthdirectory", "", "", QObject::tr("LSynth Directory"), QObject::tr("Full directory path to LSynth primitives - specify if not using default bundled in addon")},
/* 6 PATH_STUD_LOGO */ {"studlogodirectory", "", "", QObject::tr("Stud Logo Directory"), QObject::tr("Full directory path to stud logo primitives - if stud logo enabled, specify if unofficial parts not used or not using default bundled in addon")},
/* 7 PATH_STUDIO_LDRAW */ {"", "studioldrawpath", "", QObject::tr("Stud.io LDraw Path"), QObject::tr("Full filepath to the Stud.io LDraw Parts Library (download from https://www.bricklink.com/v3/studio/download.page)")}
/* 7 PATH_STUDIO_LDRAW */ {"", "studioldrawpath", "", QObject::tr("Stud.io LDraw Path"), QObject::tr("Full filepath to the Stud.io LDraw Parts Library (download from https://www.bricklink.com/v3/studio/download.page)")},
/* 8 PATH_STUDIO_CUSTOM_PARTS */ {"", "studiocustompartspath", "", QObject::tr("Stud.io Custom Parts Path"),QObject::tr("Full filepath to the Stud.io LDraw Custom Parts")}
};
lcBlenderPreferences::BlenderSettings lcBlenderPreferences::mBlenderSettings [NUM_SETTINGS];
@ -2419,14 +2420,15 @@ void lcBlenderPreferences::LoadSettings()
const QString DefaultBlendFile = QString("%1/Blender/config/%2").arg(gAddonPreferences->mDataDir).arg(LC_BLENDER_ADDON_BLEND_FILE);
QStringList const AddonPaths = QStringList()
/* PATH_BLENDER */ << lcGetProfileString(LC_PROFILE_BLENDER_PATH)
/* PATH_BLENDFILE */ << (QFileInfo(DefaultBlendFile).exists() ? DefaultBlendFile : QString())
/* PATH_ENVIRONMENT */ << QString()
/* PATH_LDCONFIG */ << lcGetProfileString(LC_PROFILE_COLOR_CONFIG)
/* PATH_LDRAW */ << QFileInfo(lcGetProfileString(LC_PROFILE_PARTS_LIBRARY)).absolutePath()
/* PATH_LSYNTH */ << QString()
/* PATH_STUD_LOGO */ << QString()
/* PATH_STUDIO_LDRAW */ << QString();
/* 0 PATH_BLENDER */ << lcGetProfileString(LC_PROFILE_BLENDER_PATH)
/* 1 PATH_BLENDFILE */ << (QFileInfo(DefaultBlendFile).exists() ? DefaultBlendFile : QString())
/* 2 PATH_ENVIRONMENT */ << QString()
/* 3 PATH_LDCONFIG */ << lcGetProfileString(LC_PROFILE_COLOR_CONFIG)
/* 4 PATH_LDRAW */ << QFileInfo(lcGetProfileString(LC_PROFILE_PARTS_LIBRARY)).absolutePath()
/* 5 PATH_LSYNTH */ << QString()
/* 6 PATH_STUD_LOGO */ << QString()
/* 7 PATH_STUDIO_LDRAW */ << QString()
/* 8 PATH_STUDIO_CUSTOM_PARTS */ << QString();
for (int LblIdx = 0; LblIdx < NumPaths(DEFAULT_SETTINGS); LblIdx++)
{
mBlenderPaths[LblIdx] =
@ -2478,7 +2480,7 @@ void lcBlenderPreferences::LoadSettings()
for (int LblIdx = 1/*skip blender executable*/; LblIdx < NumPaths(); LblIdx++)
{
if (LblIdx == PATH_STUDIO_LDRAW)
if (LblIdx >= PATH_STUDIO_LDRAW)
continue;
const QString& Key = QString("%1/%2").arg(LC_BLENDER_ADDON, mBlenderPaths[LblIdx].key);
const QString& Value = Settings.value(Key, QString()).toString();
@ -2614,7 +2616,7 @@ void lcBlenderPreferences::SaveSettings()
for (int LblIdx = 1/*skip blender executable*/; LblIdx < NumPaths(); LblIdx++)
{
if (LblIdx == PATH_STUDIO_LDRAW)
if (LblIdx >= PATH_STUDIO_LDRAW)
continue;
Key = mBlenderPaths[LblIdx].key;
Value = QDir::toNativeSeparators(mBlenderPaths[LblIdx].value);

23
common/lc_blenderpreferences.h
View file

@ -121,14 +121,15 @@ private slots:
private:
enum BlenderPathType
{
PATH_BLENDER, // 0 QLineEdit/QPushButton
PATH_BLENDFILE, // 1 QLineEdit/QPushButton
PATH_ENVIRONMENT, // 2 QLineEdit/QPushButton
PATH_LDCONFIG, // 3 QLineEdit/QPushButton
PATH_LDRAW, // 4 QLineEdit/QPushButton
PATH_LSYNTH, // 5 QLineEdit/QPushButton
PATH_STUD_LOGO, // 6 QLineEdit/QPushButton
PATH_STUDIO_LDRAW, // 7 QLineEdit/QPushButton
PATH_BLENDER, // 0 QLineEdit/QPushButton
PATH_BLENDFILE, // 1 QLineEdit/QPushButton
PATH_ENVIRONMENT, // 2 QLineEdit/QPushButton
PATH_LDCONFIG, // 3 QLineEdit/QPushButton
PATH_LDRAW, // 4 QLineEdit/QPushButton
PATH_LSYNTH, // 5 QLineEdit/QPushButton
PATH_STUD_LOGO, // 6 QLineEdit/QPushButton
PATH_STUDIO_LDRAW, // 7 QLineEdit/QPushButton
PATH_STUDIO_CUSTOM_PARTS, // 8 QLineEdit/QPushButton
NUM_PATHS
};
@ -239,10 +240,10 @@ private:
LBL_BLEND_FILE_TRUSTED_MM, // 2 QCheckBox
LBL_CASE_SENSITIVE_FILESYSTEM, // 3 QCheckBox
LBL_CROP_IMAGE_MM, // 4 QCheckBox
LBL_DISPLAY_LOGO, // 5 QCheckBox
NUM_COMBO_ITEMS_MM, // 5
LBL_DISPLAY_LOGO = NUM_COMBO_ITEMS_MM, // 5 QCheckBox
LBL_IMPORT_CAMERAS_MM, // 6 QCheckBox
NUM_COMBO_ITEMS_MM, // 7
LBL_IMPORT_EDGES = NUM_COMBO_ITEMS_MM, // 7 QCheckBox
LBL_IMPORT_EDGES, // 7 QCheckBox
LBL_IMPORT_LIGHTS_MM, // 8 QCheckBox
LBL_KEEP_ASPECT_RATIO_MM, // 9 QCheckBox
LBL_MAKE_GAPS, // 10 QCheckBox