Skip to content

Commit c1a60c2

Browse files
Update to v22.5
1 parent 2465c50 commit c1a60c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3919
-408
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ You may want to check out Aspose free [PPT to PDF](https://products.aspose.app/s
2828
**Web:** HTML/HTML5
2929
**Other:** MPEG4, SWF (export whole presentations)
3030

31+
## Enhancements in Version 22.5
32+
* Added **Paragraphs** property to **SmartArtNode** class to enable getting and setting text for SmartArt nodes.
33+
* Added **ImageTransformList** property to **PictureFill** class to enable setting image transform effects. Added **ImageTransformEffect** class and subclasses for different kind of of effects.
34+
* Added **PictureFillFormat** property to **VideoFrame** class to enable setting poster image for video frames.
35+
* Added **SlideIndex** and **ShapeIndex** properties to **ResourceUri** class to simplify retrieveing slide & shape indexes for resources.
36+
* Removed redundant **BoxAndWhiskersSeries**, **WaterfallSeries** and **WaterfallChartDataPoint** classes.
37+
3138
## Enhancements in Version 22.4
3239
* Added **TransitionType** and **SlidesTransitionDuration** properties to **VideoExportOptions** class to enable creation videos with transitions.
3340
* Added **DefaultPortionFormat** property to **Paragraph** class. Added new **PortionFormat** class.

TestData/oleObject.xlsx

13.8 KB
Binary file not shown.

TestData/test.pptx

12.5 KB
Binary file not shown.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ allprojects {
4141
}
4242

4343
jar {
44-
baseName 'aspose-slides-cloud-android-22.4.0'
44+
baseName 'aspose-slides-cloud-android-22.5.0'
4545
}

src/main/java/com/aspose/slides/JSON.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,39 @@ public JSON() {
7777
registerType(com.aspose.slides.model.Task.class, com.aspose.slides.model.AddMasterSlide.class, "type", com.aspose.slides.model.Task.TypeEnum.ADDMASTERSLIDE.getValue(), typeAdapters, valueMap);
7878
registerType(com.aspose.slides.model.Task.class, com.aspose.slides.model.AddShape.class, "type", com.aspose.slides.model.Task.TypeEnum.ADDSHAPE.getValue(), typeAdapters, valueMap);
7979
registerType(com.aspose.slides.model.Task.class, com.aspose.slides.model.AddSlide.class, "type", com.aspose.slides.model.Task.TypeEnum.ADDSLIDE.getValue(), typeAdapters, valueMap);
80+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.AlphaBiLevelEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.ALPHABILEVEL.getValue(), typeAdapters, valueMap);
81+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.AlphaCeilingEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.ALPHACEILING.getValue(), typeAdapters, valueMap);
82+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.AlphaFloorEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.ALPHAFLOOR.getValue(), typeAdapters, valueMap);
83+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.AlphaInverseEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.ALPHAINVERSE.getValue(), typeAdapters, valueMap);
84+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.AlphaModulateEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.ALPHAMODULATE.getValue(), typeAdapters, valueMap);
85+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.AlphaModulateFixedEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.ALPHAMODULATEFIXED.getValue(), typeAdapters, valueMap);
86+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.AlphaReplaceEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.ALPHAREPLACE.getValue(), typeAdapters, valueMap);
8087
registerType(com.aspose.slides.model.PathSegment.class, com.aspose.slides.model.ArcToPathSegment.class, "type", com.aspose.slides.model.PathSegment.TypeEnum.ARCTO.getValue(), typeAdapters, valueMap);
8188
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.ArrayElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.ARRAY.getValue(), typeAdapters, valueMap);
8289
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.BarElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.BAR.getValue(), typeAdapters, valueMap);
8390
registerType(com.aspose.slides.model.InputFile.class, com.aspose.slides.model.Base64InputFile.class, "type", com.aspose.slides.model.InputFile.TypeEnum.BASE64.getValue(), typeAdapters, valueMap);
91+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.BiLevelEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.BILEVEL.getValue(), typeAdapters, valueMap);
8492
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.BlockElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.BLOCK.getValue(), typeAdapters, valueMap);
93+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.BlurImageEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.BLUR.getValue(), typeAdapters, valueMap);
8594
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.BorderBoxElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.BORDERBOX.getValue(), typeAdapters, valueMap);
8695
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.BoxElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.BOX.getValue(), typeAdapters, valueMap);
8796
registerType(com.aspose.slides.model.PathSegment.class, com.aspose.slides.model.ClosePathSegment.class, "type", com.aspose.slides.model.PathSegment.TypeEnum.CLOSE.getValue(), typeAdapters, valueMap);
97+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.ColorChangeEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.COLORCHANGE.getValue(), typeAdapters, valueMap);
98+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.ColorReplaceEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.COLORREPLACE.getValue(), typeAdapters, valueMap);
8899
registerType(com.aspose.slides.model.PathSegment.class, com.aspose.slides.model.CubicBezierToPathSegment.class, "type", com.aspose.slides.model.PathSegment.TypeEnum.CUBICBEZIERTO.getValue(), typeAdapters, valueMap);
89100
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.DelimiterElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.DELIMITER.getValue(), typeAdapters, valueMap);
101+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.DuotoneEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.DUOTONE.getValue(), typeAdapters, valueMap);
102+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.FillOverlayImageEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.FILLOVERLAY.getValue(), typeAdapters, valueMap);
90103
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.FractionElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.FRACTION.getValue(), typeAdapters, valueMap);
91104
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.FunctionElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.FUNCTION.getValue(), typeAdapters, valueMap);
92105
registerType(com.aspose.slides.model.FillFormat.class, com.aspose.slides.model.GradientFill.class, "type", com.aspose.slides.model.FillFormat.TypeEnum.GRADIENT.getValue(), typeAdapters, valueMap);
106+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.GrayScaleEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.GRAYSCALE.getValue(), typeAdapters, valueMap);
93107
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.GroupingCharacterElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.GROUPINGCHARACTER.getValue(), typeAdapters, valueMap);
108+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.HslEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.HSL.getValue(), typeAdapters, valueMap);
94109
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.LeftSubSuperscriptElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.LEFTSUBSUPERSCRIPTELEMENT.getValue(), typeAdapters, valueMap);
95110
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.LimitElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.LIMIT.getValue(), typeAdapters, valueMap);
96111
registerType(com.aspose.slides.model.PathSegment.class, com.aspose.slides.model.LineToPathSegment.class, "type", com.aspose.slides.model.PathSegment.TypeEnum.LINETO.getValue(), typeAdapters, valueMap);
112+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.LuminanceEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.LUMINANCE.getValue(), typeAdapters, valueMap);
97113
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.MatrixElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.MATRIX.getValue(), typeAdapters, valueMap);
98114
registerType(com.aspose.slides.model.Task.class, com.aspose.slides.model.Merge.class, "type", com.aspose.slides.model.Task.TypeEnum.MERGE.getValue(), typeAdapters, valueMap);
99115
registerType(com.aspose.slides.model.PathSegment.class, com.aspose.slides.model.MoveToPathSegment.class, "type", com.aspose.slides.model.PathSegment.TypeEnum.MOVETO.getValue(), typeAdapters, valueMap);
@@ -123,9 +139,9 @@ public JSON() {
123139
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.SubscriptElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.SUBSCRIPTELEMENT.getValue(), typeAdapters, valueMap);
124140
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.SuperscriptElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.SUPERSCRIPTELEMENT.getValue(), typeAdapters, valueMap);
125141
registerType(com.aspose.slides.model.MathElement.class, com.aspose.slides.model.TextElement.class, "type", com.aspose.slides.model.MathElement.TypeEnum.TEXT.getValue(), typeAdapters, valueMap);
142+
registerType(com.aspose.slides.model.ImageTransformEffect.class, com.aspose.slides.model.TintEffect.class, "type", com.aspose.slides.model.ImageTransformEffect.TypeEnum.TINT.getValue(), typeAdapters, valueMap);
126143
registerType(com.aspose.slides.model.Task.class, com.aspose.slides.model.UpdateBackground.class, "type", com.aspose.slides.model.Task.TypeEnum.UPDATEBACKGROUND.getValue(), typeAdapters, valueMap);
127144
registerType(com.aspose.slides.model.Task.class, com.aspose.slides.model.UpdateShape.class, "type", com.aspose.slides.model.Task.TypeEnum.UPDATESHAPE.getValue(), typeAdapters, valueMap);
128-
registerType(com.aspose.slides.model.OneValueSeries.class, com.aspose.slides.model.BoxAndWhiskerSeries.class, "dataPointType", com.aspose.slides.model.OneValueSeries.DataPointTypeEnum.ONEVALUE.getValue(), typeAdapters, valueMap);
129145
registerType(com.aspose.slides.model.XYSeries.class, com.aspose.slides.model.BubbleSeries.class, "dataPointType", com.aspose.slides.model.XYSeries.DataPointTypeEnum.BUBBLE.getValue(), typeAdapters, valueMap);
130146
registerType(com.aspose.slides.model.ShapeBase.class, com.aspose.slides.model.Chart.class, "type", com.aspose.slides.model.ShapeBase.TypeEnum.CHART.getValue(), typeAdapters, valueMap);
131147
registerType(com.aspose.slides.model.ShapeBase.class, com.aspose.slides.model.GraphicalObject.class, "type", com.aspose.slides.model.ShapeBase.TypeEnum.GRAPHICALOBJECT.getValue(), typeAdapters, valueMap);
@@ -135,7 +151,6 @@ public JSON() {
135151
registerType(com.aspose.slides.model.ShapeBase.class, com.aspose.slides.model.SmartArt.class, "type", com.aspose.slides.model.ShapeBase.TypeEnum.SMARTART.getValue(), typeAdapters, valueMap);
136152
registerType(com.aspose.slides.model.ShapeBase.class, com.aspose.slides.model.SummaryZoomFrame.class, "type", com.aspose.slides.model.ShapeBase.TypeEnum.SUMMARYZOOMFRAME.getValue(), typeAdapters, valueMap);
137153
registerType(com.aspose.slides.model.ShapeBase.class, com.aspose.slides.model.Table.class, "type", com.aspose.slides.model.ShapeBase.TypeEnum.TABLE.getValue(), typeAdapters, valueMap);
138-
registerType(com.aspose.slides.model.OneValueSeries.class, com.aspose.slides.model.WaterfallSeries.class, "dataPointType", com.aspose.slides.model.OneValueSeries.DataPointTypeEnum.ONEVALUE.getValue(), typeAdapters, valueMap);
139154
registerType(com.aspose.slides.model.GeometryShape.class, com.aspose.slides.model.AudioFrame.class, "type", com.aspose.slides.model.GeometryShape.TypeEnum.AUDIOFRAME.getValue(), typeAdapters, valueMap);
140155
registerType(com.aspose.slides.model.GeometryShape.class, com.aspose.slides.model.Connector.class, "type", com.aspose.slides.model.GeometryShape.TypeEnum.CONNECTOR.getValue(), typeAdapters, valueMap);
141156
registerType(com.aspose.slides.model.GeometryShape.class, com.aspose.slides.model.PictureFrame.class, "type", com.aspose.slides.model.GeometryShape.TypeEnum.PICTUREFRAME.getValue(), typeAdapters, valueMap);

src/main/java/com/aspose/slides/model/WaterfallSeries.java renamed to src/main/java/com/aspose/slides/model/AlphaBiLevelEffect.java

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@
2828
package com.aspose.slides.model;
2929

3030
import java.util.Objects;
31-
import com.aspose.slides.model.EffectFormat;
32-
import com.aspose.slides.model.FillFormat;
33-
import com.aspose.slides.model.LineFormat;
34-
import com.aspose.slides.model.OneValueChartDataPoint;
35-
import com.aspose.slides.model.OneValueSeries;
36-
import com.aspose.slides.model.SeriesMarker;
31+
import com.aspose.slides.model.ImageTransformEffect;
3732
import com.google.gson.TypeAdapter;
3833
import com.google.gson.annotations.JsonAdapter;
3934
import com.google.gson.annotations.SerializedName;
@@ -42,41 +37,40 @@
4237
import io.swagger.annotations.ApiModel;
4338
import io.swagger.annotations.ApiModelProperty;
4439
import java.io.IOException;
45-
import java.util.List;
4640
import java.util.ArrayList;
4741
import java.util.Hashtable;
4842
import java.util.Map;
4943

5044
/**
51-
* One value series.
45+
* Represents an Alpha Bi-Level effect.
5246
*/
53-
@ApiModel(description = "One value series.")
54-
public class WaterfallSeries extends OneValueSeries {
55-
@SerializedName(value = "showConnectorLines", alternate = { "ShowConnectorLines" })
56-
private Boolean showConnectorLines;
47+
@ApiModel(description = "Represents an Alpha Bi-Level effect.")
48+
public class AlphaBiLevelEffect extends ImageTransformEffect {
49+
@SerializedName(value = "threshold", alternate = { "Threshold" })
50+
private Double threshold;
5751

5852

59-
public WaterfallSeries() {
53+
public AlphaBiLevelEffect() {
6054
super();
61-
setDataPointType(DataPointTypeEnum.ONEVALUE);
55+
setType(TypeEnum.ALPHABILEVEL);
6256
}
6357

64-
public WaterfallSeries showConnectorLines(Boolean showConnectorLines) {
65-
this.showConnectorLines = showConnectorLines;
58+
public AlphaBiLevelEffect threshold(Double threshold) {
59+
this.threshold = threshold;
6660
return this;
6761
}
6862

6963
/**
70-
* True if inner points are shown.
71-
* @return showConnectorLines
64+
* Returns effect threshold.
65+
* @return threshold
7266
**/
73-
@ApiModelProperty(value = "True if inner points are shown.")
74-
public Boolean isShowConnectorLines() {
75-
return showConnectorLines;
67+
@ApiModelProperty(required = true, value = "Returns effect threshold.")
68+
public Double getThreshold() {
69+
return threshold;
7670
}
7771

78-
public void setShowConnectorLines(Boolean showConnectorLines) {
79-
this.showConnectorLines = showConnectorLines;
72+
public void setThreshold(Double threshold) {
73+
this.threshold = threshold;
8074
}
8175

8276

@@ -88,22 +82,22 @@ public boolean equals(java.lang.Object o) {
8882
if (o == null || getClass() != o.getClass()) {
8983
return false;
9084
}
91-
WaterfallSeries waterfallSeries = (WaterfallSeries) o;
92-
return true && Objects.equals(this.showConnectorLines, waterfallSeries.showConnectorLines) && super.equals(o);
85+
AlphaBiLevelEffect alphaBiLevelEffect = (AlphaBiLevelEffect) o;
86+
return true && Objects.equals(this.threshold, alphaBiLevelEffect.threshold) && super.equals(o);
9387
}
9488

9589
@Override
9690
public int hashCode() {
97-
return Objects.hash(showConnectorLines, super.hashCode());
91+
return Objects.hash(threshold, super.hashCode());
9892
}
9993

10094

10195
@Override
10296
public String toString() {
10397
StringBuilder sb = new StringBuilder();
104-
sb.append("class WaterfallSeries {\n");
98+
sb.append("class AlphaBiLevelEffect {\n");
10599
sb.append(" ").append(toIndentedString(super.toString())).append("\n");
106-
sb.append(" showConnectorLines: ").append(toIndentedString(showConnectorLines)).append("\n");
100+
sb.append(" threshold: ").append(toIndentedString(threshold)).append("\n");
107101
sb.append("}");
108102
return sb.toString();
109103
}
@@ -124,6 +118,6 @@ private String toIndentedString(java.lang.Object o) {
124118
private static final Map<String, Object> typeDeterminers = new Hashtable<String, Object>();
125119

126120
static {
127-
typeDeterminers.put("DataPointType", DataPointTypeEnum.ONEVALUE);
121+
typeDeterminers.put("Type", TypeEnum.ALPHABILEVEL);
128122
}
129123
}

0 commit comments

Comments
 (0)
close