Implemented ImageValueViewer, and more of the related classes

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@54 0fc631ac-6414-0410-93d0-97cfa31319b6

src/render/value/boolean.cpp

@@ -0,0 +1,11 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <render/value/boolean.hpp>
+
+// ----------------------------------------------------------------------------- : 

src/render/value/boolean.hpp

@@ -0,0 +1,18 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_RENDER_VALUE_BOOLEAN
+#define HEADER_RENDER_VALUE_BOOLEAN
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+
+// ----------------------------------------------------------------------------- : 
+
+
+// ----------------------------------------------------------------------------- : EOF
+#endif

src/render/value/choice.cpp

@@ -0,0 +1,11 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <render/value/choice.hpp>
+
+// ----------------------------------------------------------------------------- : 

src/render/value/choice.hpp

@@ -0,0 +1,18 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_RENDER_VALUE_CHOICE
+#define HEADER_RENDER_VALUE_CHOICE
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+
+// ----------------------------------------------------------------------------- : 
+
+
+// ----------------------------------------------------------------------------- : EOF
+#endif

src/render/value/color.cpp

@@ -0,0 +1,11 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <render/value/color.hpp>
+
+// ----------------------------------------------------------------------------- : 

src/render/value/color.hpp

@@ -0,0 +1,18 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_RENDER_VALUE_COLOR
+#define HEADER_RENDER_VALUE_COLOR
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+
+// ----------------------------------------------------------------------------- : 
+
+
+// ----------------------------------------------------------------------------- : EOF
+#endif

src/render/value/image.cpp

@@ -0,0 +1,104 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <render/value/image.hpp>
+#include <render/card/viewer.hpp>
+#include <data/set.hpp>
+#include <gui/util.hpp>
+
+// ----------------------------------------------------------------------------- : ImageValueViewer
+
+void ImageValueViewer::draw(RotatedDC& dc) {
+	drawFieldBorder(dc);
+	// try to load image
+	if (!bitmap.Ok() && !value().filename.empty()) {
+		try {
+			InputStreamP image_file = getSet().openIn(value().filename);
+			Image image;
+			if (image.LoadFile(*image_file)) {
+				image.Rescale(dc.trS(style().width), dc.trS(style().height));
+				// apply mask to image
+/*				loadMask(dc);
+				if (alpha_mask) alpha_mask->setAlpha(image);
+*/				bitmap = Bitmap(image);
+			}
+		} catch (Error e) {
+			handle_error(e, false, false); // don't handle now, we are in onPaint
+		}
+	}
+	// if there is no image, generate a placeholder, only if there is enough room for it
+	if (!bitmap.Ok() && style().width > 40) {
+		bitmap = imagePlaceholder(dc, dc.trS(style().width), dc.trS(style().height), viewer.drawEditing());
+/*		loadMask(dc);
+		if (alpha_mask) alpha_mask->setAlpha(bitmap);
+/*		if (alphaMask) {
+			// convert to image and apply alpha
+			Image image = bmp.ConvertToImage();
+			alpha_mask->setAlpha(image);
+			bitmap = image;
+		}
+*/	}
+	// draw image, if any
+	if (bitmap.Ok()) {
+		dc.DrawBitmap(bitmap, style().getPos());
+	}
+}
+
+bool ImageValueViewer::containsPoint(const RealPoint& p) const {
+	int x = p.x - style().left;
+	int y = p.y - style().top;
+	if (x < 0 || y < 0 || x >= (int)style().width || y >= (int)style().height) {
+		return false; // outside rectangle
+	}
+/*	// check against mask
+	if (!style->maskFilename.value.empty()) {
+		RotatedObject rot(viewer.getRotation());
+		loadMask(rot);
+		return !alphaMask->isTransparent(x, y);
+	} else {
+		return true;
+	}*/
+	return true;
+}
+
+void ImageValueViewer::onValueChange() {
+	bitmap = Bitmap();
+}
+
+void ImageValueViewer::onStyleChange() {
+	bitmap = Bitmap();
+//	alpha_mask = AlphaMaskP();
+}
+
+Bitmap ImageValueViewer::imagePlaceholder(const Rotation& rot, UInt w, UInt h, bool editing) {
+	// Bitmap and memory dc
+	Bitmap bmp(w, h, 24);
+	wxMemoryDC mdc;
+	mdc.SelectObject(bmp);
+	RealRect rect(0,0,w,h);
+	RotatedDC dc(mdc, 0, rect, 1.0, true);
+	// Draw checker background
+	draw_checker(dc, rect);
+	// Draw text
+	if (editing) {
+		// only when in editor mode
+		for (UInt size = 12 ; size > 2 ; --size) {
+			dc.SetFont(wxFont(size, wxSWISS, wxNORMAL, wxNORMAL));
+			RealSize rs = dc.GetTextExtent(_("double click to load image"));
+			if (rs.width <= w - 10 && rs.height < h - 10) {
+				// text fits
+				dc.SetTextForeground(*wxBLACK);
+				dc.DrawText(_("double click to load image"), align_in_rect(ALIGN_MIDDLE_CENTER, rs, rect));
+				break;
+			}
+		}
+	}
+	// Done
+	mdc.SelectObject(wxNullBitmap);
+	return bmp;
+}

src/render/value/image.hpp

@@ -0,0 +1,42 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_RENDER_VALUE_IMAGE
+#define HEADER_RENDER_VALUE_IMAGE
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+#include <render/value/viewer.hpp>
+#include <data/field/image.hpp>
+
+// ----------------------------------------------------------------------------- : ImageValueViewer
+
+/// Viewer that displays an image value
+class ImageValueViewer : public ValueViewer {
+  public:
+	DECLARE_VALUE_VIEWER(Image) : ValueViewer(parent,style) {}
+	
+	void draw(RotatedDC& dc);
+	
+	bool containsPoint(const RealPoint& p) const;
+	
+	void onValueChange();
+	void onStyleChange();
+			
+  private:
+	Bitmap bitmap;
+//	mutable AlphaMaskP alpha_mask;
+	
+//	void loadMask(const RotatedObject& rot) const;
+	
+	/// Generate a placeholder image
+	static Bitmap imagePlaceholder(const Rotation& rot, UInt w, UInt h, bool editing);
+};
+
+
+// ----------------------------------------------------------------------------- : EOF
+#endif

src/render/value/multiple_choice.cpp

@@ -0,0 +1,11 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <render/value/multiple_choice.hpp>
+
+// ----------------------------------------------------------------------------- : 

src/render/value/multiple_choice.hpp

@@ -0,0 +1,18 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_RENDER_VALUE_MULTIPLE_CHOICE
+#define HEADER_RENDER_VALUE_MULTIPLE_CHOICE
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+
+// ----------------------------------------------------------------------------- : 
+
+
+// ----------------------------------------------------------------------------- : EOF
+#endif

src/render/value/symbol.cpp

@@ -0,0 +1,11 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <render/value/symbol.hpp>
+
+// ----------------------------------------------------------------------------- : 

src/render/value/symbol.hpp

@@ -0,0 +1,18 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_RENDER_VALUE_SYMBOL
+#define HEADER_RENDER_VALUE_SYMBOL
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+
+// ----------------------------------------------------------------------------- : 
+
+
+// ----------------------------------------------------------------------------- : EOF
+#endif

src/render/value/text.cpp

@@ -0,0 +1,11 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <render/value/text.hpp>
+
+// ----------------------------------------------------------------------------- : 

src/render/value/text.hpp

@@ -0,0 +1,18 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_RENDER_VALUE_TEXT
+#define HEADER_RENDER_VALUE_TEXT
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+
+// ----------------------------------------------------------------------------- : 
+
+
+// ----------------------------------------------------------------------------- : EOF
+#endif

src/render/value/viewer.cpp

@@ -7,15 +7,47 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <render/value/viewer.hpp>
+#include <render/value/text.hpp>
+#include <render/value/choice.hpp>
+#include <render/value/multiple_choice.hpp>
+#include <render/value/boolean.hpp>
+#include <render/value/image.hpp>
+#include <render/value/symbol.hpp>
+#include <render/value/color.hpp>
+#include <render/card/viewer.hpp>
 
 // ----------------------------------------------------------------------------- : ValueViewer
 
+ValueViewer::ValueViewer(DataViewer& parent, const StyleP& style)
+	: viewer(parent), styleP(style)
+{}
+
+Set& ValueViewer::getSet() const { return *viewer.getSet(); }
+
 void ValueViewer::setValue(const ValueP& value) {
 	assert(value->fieldP == styleP->fieldP); // matching field
 	valueP = value;
 	onValueChange();
 }
 
+bool ValueViewer::containsPoint(const RealPoint& p) const {
+	return p.x >= styleP->left
+	    && p.y >= styleP->top
+	    && p.x <  styleP->left + (int)(styleP->width)
+	    && p.y <  styleP->top  + (int)(styleP->height);
+}
+RealRect ValueViewer::boundingBox() const {
+	return styleP->getRect().grow(1);
+}
+
+void ValueViewer::drawFieldBorder(RotatedDC& dc) {
+	if (viewer.drawBorders() && getField()->editable) {
+		dc.SetPen(viewer.borderPen(viewer.focusedViewer() == this));
+		dc.SetBrush(*wxTRANSPARENT_BRUSH);
+		dc.DrawRectangle(styleP->getRect().grow(dc.trInvS(1)));
+	}
+}
+
 // ----------------------------------------------------------------------------- : Development/debug
 
 #ifdef _DEBUG
@@ -31,11 +63,18 @@ void ValueViewer::setValue(const ValueP& value) {
 #include <data/field/symbol.hpp>
 #include <data/field/text.hpp>
 
+#define IMPLEMENT_MAKE_VIEWER(Type)														\
+	ValueViewerP Type##Style::makeViewer(DataViewer& parent, const StyleP& thisP) {		\
+		assert(thisP.get() == this);													\
+		return ValueViewerP(new Type##ValueViewer(parent, static_pointer_cast<Type##Style>(thisP)));	\
+	}
+
 ValueViewerP ChoiceStyle        ::makeViewer(DataViewer& parent, const StyleP& thisP) { return ValueViewerP(); }
 ValueViewerP BooleanStyle       ::makeViewer(DataViewer& parent, const StyleP& thisP) { return ValueViewerP(); }
 ValueViewerP MultipleChoiceStyle::makeViewer(DataViewer& parent, const StyleP& thisP) { return ValueViewerP(); }
 ValueViewerP ColorStyle         ::makeViewer(DataViewer& parent, const StyleP& thisP) { return ValueViewerP(); }
-ValueViewerP ImageStyle         ::makeViewer(DataViewer& parent, const StyleP& thisP) { return ValueViewerP(); }
+//ValueViewerP ImageStyle         ::makeViewer(DataViewer& parent, const StyleP& thisP) { return ValueViewerP(); }
+IMPLEMENT_MAKE_VIEWER(Image);
 ValueViewerP SymbolStyle        ::makeViewer(DataViewer& parent, const StyleP& thisP) { return ValueViewerP(); }
 ValueViewerP TextStyle          ::makeViewer(DataViewer& parent, const StyleP& thisP) { return ValueViewerP(); }
 

src/render/value/viewer.hpp

@@ -14,6 +14,7 @@
 #include <util/real_point.hpp>
 #include <data/field.hpp>
 
+class Set;
 class DataViewer;
 class ValueAction;
 DECLARE_POINTER_TYPE(Style);
@@ -33,6 +34,8 @@ class ValueViewer {
 	void setValue(const ValueP&);
 	/// Return the associated field
 	inline const FieldP& getField() const { return styleP->fieldP; }
+	/// Return the associated style
+	inline const StyleP& getStyle() const { return styleP; }
 	
 	// Draw this value
 	virtual void draw(RotatedDC& dc) = 0;
@@ -65,17 +68,19 @@ class ValueViewer {
 	
 	/// Draws a border around the field
 	void drawFieldBorder(RotatedDC& dc);
+	
+	Set& getSet() const;
 };
 
 // ----------------------------------------------------------------------------- : Utility
 
-#define VALUE_VIEWER(Base, Type)								\
-  public:														\
-	Type(DataViewer& parent, const Type ## StyleP& style)		\
-  private:														\
-	inline Type##Style& style() const { return *styleP; }		\
-	inline Type##Value& value() const { return *valueP; }		\
-	inline Type##Field& field() const { return styleP->field(); }
+#define DECLARE_VALUE_VIEWER(Type)																	\
+  private:																							\
+	inline const Type##Style& style() const { return static_cast<const Type##Style&>(*styleP); }	\
+	inline const Type##Value& value() const { return static_cast<const Type##Value&>(*valueP); }	\
+	inline const Type##Field& field() const { return style().field(); }								\
+  public:																							\
+	Type##ValueViewer(DataViewer& parent, const Type ## StyleP& style)
 
 
 // ----------------------------------------------------------------------------- : EOF