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

cleanup

Browse Source
This commit is contained in:
GenevensiS
2025-08-11 17:54:52 +02:00
parent 81e9a1e26f
commit 78b93e5701
7 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/format/clipboard.cpp
-4
View File
@@ -71,7 +71,6 @@ CardsDataObject::CardsDataObject(const SetP& set, const vector<CardP>& cards) {
}
WrappedCards data = { set->game.get(), set->game->name(), cards };
SetText(serialize_for_clipboard(*set, data));
queue_message(MESSAGE_WARNING, GetText());
// restore cards
for (size_t i = 0 ; i < cards.size() ; ++i) {
if (has_styling[i]) {
@@ -148,9 +147,6 @@ CardsOnClipboard::CardsOnClipboard(const SetP& set, const vector<CardP>& cards)
else if (cards.size() < 6) {
Add(new wxImageDataObject(export_image(set, cards, true, 0, 1.0, 0.0)));
}
else if (cards.size() < 6) {
Add(new wxBitmapDataObject(export_bitmap(set, cards, true, 0, 1.0, 0.0)));
}
// Conversion to serialized card format
Add(new CardsDataObject(set, cards), true);
}
src/data/format/formats.hpp
+3 -2
View File
@@ -98,8 +98,9 @@ Image export_image(const SetP& set, const CardP& card);
Image export_image(const SetP& set, const CardP& card, const double zoom, const Radians angle_radians = 0.0);
Image export_image(const SetP& set, const vector<CardP>& cards, bool scale_to_lowest_dpi, int padding, const double zoom, const Radians angle_radians = 0.0);
/// Export the image of a single card to a given filename
void export_image(const SetP& set, const CardP& card, const String& filename);
/// Export the image of one or more cards to a given filename
void export_image(const SetP& set, const CardP& card, const String& filename);
void export_image(const SetP& set, const vector<CardP>& cards, const String& path, const String& filename_template, FilenameConflicts conflicts);
/// Export a set to Magic Workstation format
void export_mws(Window* parent, const SetP& set);
src/data/format/image.cpp
+1 -4
View File
@@ -19,8 +19,6 @@
#include <render/card/viewer.hpp>
#include <wx/filename.h>
#define wxIMAGE_OPTION_PNG_DESCRIPTION wxString("PngDescription")
// ----------------------------------------------------------------------------- : Card export
class UnzoomedDataViewer : public DataViewer {
@@ -101,7 +99,6 @@ Bitmap export_bitmap(const SetP& set, const CardP& card, const double zoom, cons
return bitmap;
}
// put multiple card images into one bitmap
Bitmap export_bitmap(const SetP& set, const vector<CardP>& cards, bool scale_to_lowest_dpi, int padding, const double zoom, const Radians angle_radians) {
if (!set) throw Error(_("no set"));
vector<Bitmap> bitmaps;
@@ -186,7 +183,7 @@ void export_image(const SetP& set, const CardP& card, const String& filename) {
// but image.saveFile determines it automagicly
}
void export_images(const SetP& set, const vector<CardP>& cards,
void export_image(const SetP& set, const vector<CardP>& cards,
const String& path, const String& filename_template, FilenameConflicts conflicts)
{
wxBusyCursor busy;