amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

restore use_user_settings in to_card_image

Browse Source
This commit is contained in:
GenevensiS
2025-12-07 00:42:32 +01:00
parent ffbe3daf39
commit a616dd007b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/format/image.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ void export_image(const SetP& set, const CardP& card, const String& filename) {
const StyleSheet& stylesheet = set->stylesheetFor(card); const StyleSheet& stylesheet = set->stylesheetFor(card);
StyleSheetSettings& stylesheet_settings = settings.stylesheetSettingsFor(stylesheet); StyleSheetSettings& stylesheet_settings = settings.stylesheetSettingsFor(stylesheet);
double zoom = settings.exportZoomSettingsFor(stylesheet); double zoom = settings.exportZoomSettingsFor(stylesheet);
Radians angle = stylesheet_settings.card_normal_export() ? 0.0 : stylesheet_settings.card_angle() / 360.0 * 2.0 * M_PI; Radians angle = stylesheet_settings.card_normal_export() ? 0.0 : deg_to_rad(stylesheet_settings.card_angle());
Image img = export_image(set, card, zoom, angle); Image img = export_image(set, card, zoom, angle);
img.SaveFile(filename); img.SaveFile(filename);
} }
src/script/functions/image.cpp
+9 -4
View File
@@ -33,16 +33,21 @@ SCRIPT_FUNCTION(to_image) {
SCRIPT_FUNCTION(to_card_image) { SCRIPT_FUNCTION(to_card_image) {
SCRIPT_PARAM(Set*, set); SCRIPT_PARAM(Set*, set);
SCRIPT_PARAM(CardP, input); SCRIPT_PARAM(CardP, input);
SCRIPT_PARAM_DEFAULT(double, zoom, 100); SCRIPT_PARAM_DEFAULT(double, zoom, 100.0);
SCRIPT_PARAM_DEFAULT(Degrees, angle, 0); SCRIPT_PARAM_DEFAULT(Degrees, angle, 0.0);
SCRIPT_PARAM_DEFAULT(bool, use_user_settings, false); SCRIPT_PARAM_DEFAULT(bool, use_user_settings, false);
if (use_user_settings) { if (use_user_settings) {
// Use the User's Preferences for Export Zoom and Angle settings. // Use the User's Preferences for Export Zoom and Angle settings.
return make_intrusive<ArbitraryImage>(export_image(set, input)); const StyleSheet& stylesheet = set->stylesheetFor(input);
StyleSheetSettings& stylesheet_settings = settings.stylesheetSettingsFor(stylesheet);
zoom = settings.exportZoomSettingsFor(stylesheet);
angle = stylesheet_settings.card_normal_export() ? 0.0 : deg_to_rad(stylesheet_settings.card_angle());
} else { } else {
// Use the provided (or defaulted) Zoom and Angle. // Use the provided (or defaulted) Zoom and Angle.
return make_intrusive<ArbitraryImage>(export_image(set, input, (zoom / 100), deg_to_rad(angle))); zoom = zoom / 100.0;
angle = deg_to_rad(angle);
} }
return make_intrusive<ArbitraryImage>(export_image(set, input, zoom, angle));
} }
SCRIPT_FUNCTION(import_image) { SCRIPT_FUNCTION(import_image) {