Alpha Version

it dose something right but let's see
This commit is contained in:
Mienek
2020-01-23 13:47:44 +01:00
parent c8b0328f63
commit 1472028a81
7 changed files with 7 additions and 28 deletions

View File

@@ -10,11 +10,11 @@ IntelliRasterImage::IntelliRasterImage(int width, int height, bool fastRendererO
} }
IntelliRasterImage::Copy(const IntelliRasterImage& image) IntelliRasterImage* IntelliRasterImage::copy(const IntelliRasterImage& image){
: IntelliImage(image.getWidth(), image.getHeight(), image.isFastRendering()){
this->TypeOfImage = ImageType::RASTERIMAGE; this->TypeOfImage = ImageType::RASTERIMAGE;
IntelliRasterImage* raster = new IntelliRasterImage(imageData.width(), imageData.height(), this->fastRenderering); IntelliRasterImage* raster = new IntelliRasterImage(imageData.width(), imageData.height(), this->fastRenderering);
raster->imageData.copy(0,0,image.getWidth(),image.getWidth()); raster->imageData.copy(0,0,image.getWidth(),image.getWidth());
return raster;
} }

View File

@@ -26,7 +26,7 @@ public:
*/ */
IntelliRasterImage(int width, int height, bool fastRendererOn); IntelliRasterImage(int width, int height, bool fastRendererOn);
void copy(const IntelliRasterImage& image); IntelliRasterImage* copy(const IntelliRasterImage& image);
/*! /*!
* \brief An Destructor. * \brief An Destructor.

View File

@@ -10,11 +10,11 @@ IntelliShapedImage::IntelliShapedImage(int width, int height, bool fastRendererO
this->fastRenderering = fastRendererOn; this->fastRenderering = fastRendererOn;
} }
IntelliShapedImage::Copy(const IntelliShapedImage& image) IntelliShapedImage* IntelliShapedImage::copy(const IntelliShapedImage& image){
: IntelliRasterImage(image.getWidth(), image.getHeight(), image.isFastRendering()){
this->TypeOfImage = ImageType::SHAPEDIMAGE; this->TypeOfImage = ImageType::SHAPEDIMAGE;
IntelliShapedImage* shaped = new IntelliShapedImage(imageData.width(), imageData.height(), this->fastRenderering); IntelliShapedImage* shaped = new IntelliShapedImage(imageData.width(), imageData.height(), this->fastRenderering);
shaped->imageData.copy(0,0,image.getWidth(),image.getWidth()); shaped->imageData.copy(0,0,image.getWidth(),image.getWidth());
return shaped;
} }
IntelliShapedImage::~IntelliShapedImage(){ IntelliShapedImage::~IntelliShapedImage(){

View File

@@ -38,7 +38,7 @@ public:
*/ */
IntelliShapedImage(int width, int height, bool fastRendererOn); IntelliShapedImage(int width, int height, bool fastRendererOn);
void copy(const IntelliShapedImage& image); IntelliShapedImage* copy(const IntelliShapedImage& image);
/*! /*!
* \brief An Destructor. * \brief An Destructor.
*/ */

View File

@@ -471,7 +471,7 @@ void PaintingArea::updateTools(){
} }
void PaintingArea::historyadd(){ void PaintingArea::historyadd(){
/* /*
if (++historyPresent == 100) historyPresent = 0; if (++historyPresent == 100) historyPresent = 0;
historyMaxFuture = historyPresent; historyMaxFuture = historyPresent;
if (historyPresent == historyMaxPast) if (++historyMaxPast == 100) historyMaxPast = 0; if (historyPresent == historyMaxPast) if (++historyMaxPast == 100) historyMaxPast = 0;
@@ -480,7 +480,6 @@ void PaintingArea::historyadd(){
for (unsigned long long i=0;i < layerBundle.size();i++) { for (unsigned long long i=0;i < layerBundle.size();i++) {
}*/ }*/
} }
void PaintingArea::historyGoBack(){ void PaintingArea::historyGoBack(){

View File

@@ -7,11 +7,6 @@
int main(int argc, char*argv[]){ int main(int argc, char*argv[]){
// The main application // The main application
QApplication app(argc, argv); QApplication app(argc, argv);
std::fstream file("test.txt");
file << "Hallo welt";
file.close();
// Create and open the main window // Create and open the main window
IntelliPhotoGui window; IntelliPhotoGui window;
window.show(); window.show();

View File

@@ -1,15 +0,0 @@
#include "GUI/IntelliPhotoGui.h"
#include <QApplication>
#include <QDebug>
#include <vector>
int main(int argc, char*argv[]){
// The main application
QApplication app(argc, argv);
// Create and open the main window
IntelliPhotoGui window;
window.show();
return app.exec();
}