Automated Release Preparation

This commit is contained in:
2020-02-07 16:28:11 +01:00
parent 54c1270b38
commit 01aa5c3938
245 changed files with 1113 additions and 1251 deletions

View File

@@ -26,9 +26,9 @@ LayerObject::LayerObject(){
LayerObject::LayerObject(const LayerObject& layer){
if(layer.image->getTypeOfImage()==ImageType::RASTERIMAGE) {
this->image = new IntelliRasterImage(*dynamic_cast<IntelliRasterImage*>(layer.image));
this->image = new IntelliRasterImage(*dynamic_cast<IntelliRasterImage*>(layer.image));
}else if(layer.image->getTypeOfImage()==ImageType::SHAPEDIMAGE) {
this->image = new IntelliShapedImage(*dynamic_cast<IntelliShapedImage*>(layer.image));
this->image = new IntelliShapedImage(*dynamic_cast<IntelliShapedImage*>(layer.image));
}
this->width = layer.width;
this->height = layer.height;
@@ -130,7 +130,7 @@ void PaintingArea::slotDeleteActiveLayer(){
this->layerBundle.erase(layerBundle.begin() + activeLayer);
activeLayer--;
}
historyadd();
historyadd();
}
void PaintingArea::setLayerActive(int idx){
@@ -205,7 +205,7 @@ void PaintingArea::movePositionActive(int x, int y){
updateTools();
layerBundle[static_cast<size_t>(activeLayer)].widthOffset += x;
layerBundle[static_cast<size_t>(activeLayer)].heightOffset += y;
historyadd();
historyadd();
}
void PaintingArea::moveActiveLayer(int idx){
@@ -216,7 +216,7 @@ void PaintingArea::moveActiveLayer(int idx){
this->selectLayerDown();
}
guiReference->UpdateGui();
historyadd();
historyadd();
}
void PaintingArea::slotActivateLayer(int a){
@@ -509,25 +509,25 @@ void PaintingArea::updateTools(){
void PaintingArea::historyadd(){
history.erase(history.begin()+historyPresent+1,history.end());
historyPresent++;
history.push_back(layerBundle);
history.erase(history.begin() + historyPresent + 1,history.end());
historyPresent++;
history.push_back(layerBundle);
}
void PaintingArea::historyGoBack(){
historyPresent--;
if( historyPresent<0){
historyPresent=0;
}
layerBundle = history[static_cast<size_t>(historyPresent)];
this->guiReference->UpdateGui();
historyPresent--;
if( historyPresent<0) {
historyPresent = 0;
}
layerBundle = history[static_cast<size_t>(historyPresent)];
this->guiReference->UpdateGui();
}
void PaintingArea::historyGoForward(){
historyPresent++;
if(historyPresent>=static_cast<int>(history.size())){
historyPresent=history.size()-1;
}
layerBundle = history[static_cast<size_t>(historyPresent)];
historyPresent++;
if(historyPresent>=static_cast<int>(history.size())) {
historyPresent = history.size() - 1;
}
layerBundle = history[static_cast<size_t>(historyPresent)];
this->guiReference->UpdateGui();
}

View File

@@ -459,7 +459,7 @@ void updateTools();
/*!
* \brief history - an array out of containers to save history actions.
*/
std::vector<std::vector<LayerObject>> history = {layerBundle};
std::vector<std::vector<LayerObject> > history = {layerBundle};
/*!
* \brief historyPresent a indicator where the present is.