creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-16 13:20:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Image ENUMs

Browse Source 
ty
This commit is contained in:
Jan Schuffenhauer
2020-01-09 10:45:54 +01:00
parent ccbe3336a8
commit e3b2968f4d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Image/IntelliRasterImage.cpp
View File

@@ -5,7 +5,7 @@
IntelliRasterImage::IntelliRasterImage(int width, int height, bool fastRendererOn) IntelliRasterImage::IntelliRasterImage(int width, int height, bool fastRendererOn)
: IntelliImage(width, height, fastRendererOn){ : IntelliImage(width, height, fastRendererOn){
TypeOfImage = IntelliImage::ImageType::Raster_Image; TypeOfImage = IntelliImage::ImageType::RASTERIMAGE;
this->fastRenderer = fastRendererOn; this->fastRenderer = fastRendererOn;
} }

4
src/Image/IntelliRasterImage.h
View File

@@ -4,13 +4,13 @@
#include "Image/IntelliImage.h" #include "Image/IntelliImage.h"
/*! /*!
* \brief The IntelliRasterImage manages a Rasterimage. * \brief The IntelliRasterImage manages a RASTERIMAGE.
*/ */
class IntelliRasterImage : public IntelliImage { class IntelliRasterImage : public IntelliImage {
friend IntelliTool; friend IntelliTool;
protected: protected:
/*! /*!
* \brief A function that calculates the visibility of the image if a polygon is given. [does nothing in Rasterimage] * \brief A function that calculates the visibility of the image if a polygon is given. [does nothing in RASTERIMAGE]
*/ */
virtual void calculateVisiblity() override; virtual void calculateVisiblity() override;
public: public:

2
src/Image/IntelliShapedImage.cpp
View File

@@ -6,7 +6,7 @@
IntelliShapedImage::IntelliShapedImage(int width, int height, bool fastRendererOn) IntelliShapedImage::IntelliShapedImage(int width, int height, bool fastRendererOn)
: IntelliRasterImage(width, height, fastRendererOn){ : IntelliRasterImage(width, height, fastRendererOn){
TypeOfImage = IntelliImage::ImageType::Shaped_Image; TypeOfImage = IntelliImage::ImageType::SHAPEDIMAGE;
this->fastRenderer = fastRendererOn; this->fastRenderer = fastRendererOn;
} }

6
src/Layer/PaintingArea.cpp
View File

@@ -31,7 +31,7 @@ PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget*parent)
polygon.push_back(QPoint(000,100)); polygon.push_back(QPoint(000,100));
layerBundle[0].image->setPolygon(polygon); layerBundle[0].image->setPolygon(polygon);
this->addLayer(200,200,150,150,IntelliImage::ImageType::RASTERIMAGE); this->addLayer(200,200,150,150,IntelliImage::ImageType::RASTERIMAGE);
layerBundle[1].image->drawPlain(QColor(0,255,0,255)); layerBundle[1].image->drawPlain(QColor(0,255,0,255));
layerBundle[1].alpha=200; layerBundle[1].alpha=200;
@@ -59,9 +59,9 @@ int PaintingArea::addLayer(int width, int height, int widthOffset, int heightOff
newLayer.height = height; newLayer.height = height;
newLayer.widthOffset = widthOffset; newLayer.widthOffset = widthOffset;
newLayer.heightOffset = heightOffset; newLayer.heightOffset = heightOffset;
if(type==IntelliImage::ImageType::Raster_Image) { if(type==IntelliImage::ImageType::RASTERIMAGE) {
newLayer.image = new IntelliRasterImage(width,height,renderSettings.getFastRenderer()); newLayer.image = new IntelliRasterImage(width,height,renderSettings.getFastRenderer());
}else if(type==IntelliImage::ImageType::Shaped_Image) { }else if(type==IntelliImage::ImageType::SHAPEDIMAGE) {
newLayer.image = new IntelliShapedImage(width, height, renderSettings.getFastRenderer()); newLayer.image = new IntelliShapedImage(width, height, renderSettings.getFastRenderer());
} }
newLayer.alpha = 255; newLayer.alpha = 255;