openharmony/developtools_profiler
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_profiler synced 2024-11-27 00:51:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1730 告警清理-解决黄蓝代码不同步问题

Browse Source 
Merge pull request !1730 from 韩立斌/master
This commit is contained in:
openharmony_ci 2024-07-22 07:24:48 +00:00 committed by Gitee
commit 67b414fd5f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 459 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
host/smartperf/client/client_ui/entry/src/main/ets/common/database/DatabaseUtils.ts
View File

@ -159,7 +159,7 @@ export default {
name: dbName,
securityLevel: relationalStore.SecurityLevel.S1,
};
let results: TGeneralInfo[] = [];
let results = Array<TGeneralInfo>();
try {
return await relationalStore
.getRdbStore(globalThis.abilityContext, STORE_CONFIG)
@ -247,7 +247,6 @@ export default {
return results;
}
},
//查询表( T_INDEX_INFO) 2022-02-23 改为传时间戳
async queryData(dbPath: string): Promise<Array<TIndexInfo>> {
const STORE_CONFIG: relationalStore.StoreConfig = {
@ -711,6 +710,7 @@ export default {
.then(async (rdbStore) => {
let strSQL: string =
'select * ' + 'from task_powersensor_info order by power desc ';
return rdbStore.querySql(strSQL);
})
.then((resultSet) => {
@ -781,7 +781,7 @@ export default {
return results;
});
} catch (err) {
return results;
return results;
}
},
//查询表（detailed_applications_gpu）
@ -860,7 +860,8 @@ export default {
let current = resultSet.getString(
resultSet.getColumnIndex('current')
);
let tPowerSensorInfo = new TPowerSensorInfo('', sensor, power, current, '');
let tPowerSensorInfo = new TPowerSensorInfo('', sensor, power, current, ''
);
results.push(tPowerSensorInfo);
}
return results;
@ -1036,8 +1037,7 @@ export default {
} catch (err) {
return results;
}
},
//查询表（detailed_applications_sensor）
}, //查询表（detailed_applications_sensor）
async query_applications_sensor(
start_time: String,
end_time: String,
@ -1070,7 +1070,8 @@ export default {
let current = resultSet.getString(
resultSet.getColumnIndex('current')
);
let tPowerSensorInfo = new TPowerSensorInfo('', sensor, power, current, '');
let tPowerSensorInfo = new TPowerSensorInfo('', sensor, power, current, ''
);
results.push(tPowerSensorInfo);
}
return results;

28
host/smartperf/client/client_ui/entry/src/main/ets/common/ui/detail/chart/components/PathView.ets
View File

@ -20,11 +20,10 @@ import Paint from '../data/Paint';
import { XAxis } from './XAxis';
import YAxis from './YAxis';
import {PathPaint} from '../data/Paint';
import { CirclePaint, PathFillPaint, TextPaint, LinePaint, ImagePaint} from '../data/Paint'
import { CirclePaint, PathFillPaint, TextPaint, LinePaint, ImagePaint} from '../data/Paint';
import LineChartRenderer from '../renderer/LineChartRenderer';
import LineData from '../data/LineData';
import Utils from '../utils/Utils'
import SPLogger from '../../../../utils/SPLogger';
import Utils from '../utils/Utils';
@Component
@Preview
@ -223,18 +222,13 @@ export class PathViewModel extends ScaleMode {
public onDoubleClick(event: ClickEvent) {
this.currentXSpace = this.centerX * this.scaleX - this.centerX;
this.currentYSpace = this.centerY * this.scaleY - this.centerY;
// let maxXBefore: number = this.paintArry[this.paintArry.length - 1].x;
let maxXBefore: number = 0;
try{
SPLogger.INFO(PathViewModel.name,'定义maxXBefore===========');
if(this.paintArry.length > 0){
SPLogger.INFO(PathViewModel.name,'maxXBefore :: this.paintArry.length = ' + this.paintArry.length);
let maxXBefore: number = 0;
try {
if (this.paintArry.length > 0) {
maxXBefore = this.paintArry[this.paintArry.length - 1].x;
}
SPLogger.INFO(PathViewModel.name,'给maxXBefore赋值成功===========');
} catch (error) {
console.log(error);
SPLogger.ERROR(PathViewModel.name,'maxXBefore::' + error);
}
let maxYBefore: number = Number.MIN_VALUE;
let minYBefore: number = Number.MAX_VALUE;
@ -246,25 +240,18 @@ export class PathViewModel extends ScaleMode {
minYBefore = this.valuePaint[i].y;
}
}
this.ondraw();
let tag: string = 'maxXAfter';
// let maxXAfter: number = this.paintArry[this.paintArry.length - 1].x;
let maxXAfter: number = 0;
try {
SPLogger.INFO(tag,'定义maxXAfter===========');
if(this.paintArry.length > 0) {
SPLogger.INFO(tag,'this.paintArry.length = ' + this.paintArry.length);
if (this.paintArry.length > 0) {
maxXAfter = this.paintArry[this.paintArry.length - 1].x;
}
SPLogger.INFO(tag,'给maxXAfter赋值成功===========');
} catch(error) {
} catch (error) {
console.log(error);
SPLogger.ERROR(tag,'maxXAfter::' + error);
}
let maxYAfter: number = Number.MIN_VALUE;
let minYAfter: number = Number.MAX_VALUE;
for (let i = 0; i < this.valuePaint.length; i++) {
if (maxYAfter < this.valuePaint[i].y) {
maxYAfter = this.valuePaint[i].y;
@ -273,7 +260,6 @@ export class PathViewModel extends ScaleMode {
minYAfter = this.valuePaint[i].y;
}
}
this.transX += maxXAfter - maxXBefore;
this.transMaxY += maxYAfter - maxYBefore;
this.transMinY += minYAfter - minYBefore;

958
host/smartperf/client/client_ui/entry/src/main/ets/common/ui/detail/chart/renderer/LegendRenderer.ets
View File

@ -34,550 +34,478 @@ import ViewPortHandler from '../utils/ViewPortHandler';
import Renderer from './Renderer';
import { JArrayList } from '../utils/JArrayList';
import Paint, { LinePaint, TextPaint, PathPaint, CirclePaint, RectPaint } from '../data/Paint';
class Point {
private x1: number = 0;
private y1: number = 0;
private x2: number = 0;
private y2: number = 0;
private x1: number = 0;
private y1: number = 0;
private x2: number = 0;
private y2: number = 0;
constructor(x1: number, y1: number, x2: number, y2: number) {
this.x1 = x1;
this.y1 = y1;
this.x2 = x2;
this.y2 = y2;
this.x1 = x1;
this.y1 = y1;
this.x2 = x2;
this.y2 = y2;
}
}
export default class LegendRenderer extends Renderer {
/**
* paint for the legend labels
*/
protected mLegendLabelPaint: Paint;
/**
* paint for the legend labels
*/
protected mLegendLabelPaint: Paint;
/**
* paint used for the legend forms
*/
protected mLegendFormPaint: Paint;
/**
* paint used for the legend forms
*/
protected mLegendFormPaint: Paint;
/**
* the legend object this renderer renders
*/
protected mLegend: Legend;
/**
* the legend object this renderer renders
*/
protected mLegend: Legend;
constructor(viewPortHandler: ViewPortHandler, legend: Legend) {
super(viewPortHandler);
constructor(viewPortHandler: ViewPortHandler, legend: Legend) {
super(viewPortHandler);
this.mLegend = legend;
this.mLegend = legend;
this.mLegendLabelPaint = new Paint();
this.mLegendLabelPaint.setTextSize(9);
this.mLegendLabelPaint.setAlign(Align.LEFT);
this.mLegendLabelPaint = new Paint();
this.mLegendLabelPaint.setTextSize(9);
this.mLegendLabelPaint.setAlign(Align.LEFT);
this.mLegendFormPaint = new Paint();
this.mLegendFormPaint.setStyle(Style.FILL);
}
this.mLegendFormPaint = new Paint();
this.mLegendFormPaint.setStyle(Style.FILL);
}
/**
* Returns the Paint object used for drawing the Legend labels.
*
* @return
*/
public getLabelPaint(): Paint {
return this.mLegendLabelPaint;
}
/**
* Returns the Paint object used for drawing the Legend labels.
*
* @return
*/
public getLabelPaint(): Paint {
return this.mLegendLabelPaint;
}
/**
* Returns the Paint object used for drawing the Legend forms.
*
* @return
*/
public getFormPaint(): Paint {
return this.mLegendFormPaint;
}
/**
* Returns the Paint object used for drawing the Legend forms.
*
* @return
*/
public getFormPaint(): Paint {
return this.mLegendFormPaint;
}
protected computedEntries: JArrayList<LegendEntry> = new JArrayList<LegendEntry>(/*16*/);
protected computedEntries: JArrayList<LegendEntry> = new JArrayList<LegendEntry>();
/**
* Prepares the legend and calculates all needed forms, labels and colors.
*
* @param data
*/
public computeLegend(data?: ChartData<IDataSet<EntryOhos>>): void {
if (!this.mLegend.isLegendCustom() && data) {
this.computedEntries.clear();
for (let i: number = 0; i < data.getDataSetCount(); i++) {
let dataSet: IDataSet<EntryOhos> = data.getDataSetByIndex(i);
if (dataSet == null) {
continue;
}
let clrs: JArrayList<Number> = dataSet.getColors();
let entryCount: number = dataSet.getEntryCount();
// if we have a barchart with stacked bars
if (dataSet.constructor.name == 'IBarDataSet<EntryOhos>' && (<IBarDataSet>dataSet).isStacked()) {
let bds: IBarDataSet = <IBarDataSet>dataSet;
let sLabels: string[] = bds.getStackLabels();
let minEntries: number = Math.min(clrs.size(), bds.getStackSize());
for (let j: number = 0; j < minEntries; j++) {
let label: string;
if (sLabels.length > 0) {
let labelIndex: number = j % minEntries;
label = labelIndex < sLabels.length ? sLabels[labelIndex] : null;
/**
* Prepares the legend and calculates all needed forms, labels and colors.
*
* @param data
*/
public computeLegend(data?: ChartData<IDataSet<EntryOhos>>): void {
if (!this.mLegend.isLegendCustom() && data) {
this.computedEntries.clear();
for (let i: number = 0; i < data.getDataSetCount(); i++) {
let dataSet: IDataSet<EntryOhos> = data.getDataSetByIndex(i);
if (dataSet == null) {
continue;
}
let clrs: JArrayList<Number> = dataSet.getColors();
let entryCount: number = dataSet.getEntryCount();
// if we have a barchart with stacked bars
if (dataSet.constructor.name == 'IBarDataSet<EntryOhos>' && (<IBarDataSet> dataSet).isStacked()) {
let bds: IBarDataSet = <IBarDataSet> dataSet;
let sLabels: string[] = bds.getStackLabels();
let minEntries: number = Math.min(clrs.size(), bds.getStackSize());
for (let j: number = 0; j < minEntries; j++) {
let label: string;
if (sLabels.length > 0) {
let labelIndex: number = j % minEntries;
label = labelIndex < sLabels.length ? sLabels[labelIndex] : null;
} else {
label = null;
}
this.computedEntries.add(
new LegendEntry(
label,
dataSet.getForm(),
dataSet.getFormSize(),
dataSet.getFormLineWidth(),
dataSet.getFormLineDashEffect(),
clrs.get(j).valueOf()
)
);
}
if (bds.getLabel() != null) {
this.computedEntries.add(
new LegendEntry(
dataSet.getLabel(),
LegendForm.NONE,
Number.NaN,
Number.NaN,
null,
ColorTemplate.COLOR_NONE
)
);
}
} else {
label = null;
for (let j: number = 0; j < clrs.size() && j < entryCount; j++) {
let label: string;
if (j < clrs.size() - 1 && j < entryCount - 1) {
label = null;
} else {
label = data.getDataSetByIndex(i).getLabel();
}
this.computedEntries.add(
new LegendEntry(
label,
dataSet.getForm(),
dataSet.getFormSize(),
dataSet.getFormLineWidth(),
dataSet.getFormLineDashEffect(),
clrs.get(j).valueOf()
)
);
}
}
this.computedEntries.add(
new LegendEntry(
label,
dataSet.getForm(),
dataSet.getFormSize(),
dataSet.getFormLineWidth(),
dataSet.getFormLineDashEffect(),
clrs.get(j).valueOf()
)
);
}
if (bds.getLabel() != null) {
this.computedEntries.add(
new LegendEntry(
dataSet.getLabel(),
LegendForm.NONE,
Number.NaN,
Number.NaN,
null,
ColorTemplate.COLOR_NONE
)
);
if (this.mLegend.getExtraEntries() != null) {
let datas: LegendEntry[] = this.mLegend.getExtraEntries();
for (let i: number = 0; i < datas.length; i++) {
this.computedEntries.add(datas[i]);
}
}
} else {
for (let j: number = 0; j < clrs.size() && j < entryCount; j++) {
let label: string;
if (j < clrs.size() - 1 && j < entryCount - 1) {
label = null;
} else {
label = data.getDataSetByIndex(i).getLabel();
this.mLegend.setEntries(this.computedEntries);
}
let tf: FontWeight = this.mLegend.getTypeface();
if (tf != null) {
this.mLegendLabelPaint.setTypeface(tf);
}
this.mLegendLabelPaint.setTextSize(this.mLegend.getTextSize());
this.mLegendLabelPaint.setColor(this.mLegend.getTextColor());
this.mLegend.calculateDimensions(this.mLegendLabelPaint, this.mViewPortHandler);
}
protected legendFontMetrics: FontMetrics = new FontMetrics();
public renderLegend(): Paint[] {
let datas: Point[] = [];
if (!this.mLegend.isEnabled()) {
return;
}
let tf: FontWeight = this.mLegend.getTypeface();
if (tf != null) {
this.mLegendLabelPaint.setTypeface(tf);
}
this.mLegendLabelPaint.setTextSize(this.mLegend.getTextSize());
this.mLegendLabelPaint.setColor(this.mLegend.getTextColor());
let labelLineHeight: number = Utils.getLineHeight(this.mLegendLabelPaint);
let labelLineSpacing: number = Utils.getLineSpacing(this.mLegendLabelPaint) + this.mLegend.getYEntrySpace();
let formYOffset: number = labelLineHeight - Utils.calcTextHeight(this.mLegendLabelPaint, 'ABC') / 2.0;
let entries: LegendEntry[] = this.mLegend.getEntries();
let formToTextSpace: number = this.mLegend.getFormToTextSpace();
let xEntrySpace: number = this.mLegend.getXEntrySpace();
let orientation: LegendOrientation = this.mLegend.getOrientation(); // "HORIZONTAL" ͼ<><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
let horizontalAlignment: LegendHorizontalAlignment = this.mLegend.getHorizontalAlignment(); // "LEFT" ˮƽ<CBAE><C6BD><EFBFBD>뷽ʽ
let verticalAlignment: LegendVerticalAlignment = this.mLegend.getVerticalAlignment(); // "BOTTOM
let direction: LegendDirection = this.mLegend.getDirection(); // "LEFT_TO_RIGHT" ͼ<><CDBC><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD>
let defaultFormSize: number = this.mLegend.getFormSize();
let stackSpace: number = this.mLegend.getStackSpace();
let yoffset: number = this.mLegend.getYOffset();
let xoffset: number = this.mLegend.getXOffset();
let originPosX: number = 0.0;
let paints: Paint[] = [];
switch (horizontalAlignment) {
case LegendHorizontalAlignment.LEFT: {
if (orientation === LegendOrientation.VERTICAL) {
originPosX = xoffset;
} else {
originPosX = this.mViewPortHandler.contentLeft() + xoffset;
}
if (direction === LegendDirection.RIGHT_TO_LEFT) {
originPosX += this.mLegend.mNeededWidth;
}
break;
}
this.computedEntries.add(
new LegendEntry(
label,
dataSet.getForm(),
dataSet.getFormSize(),
dataSet.getFormLineWidth(),
dataSet.getFormLineDashEffect(),
clrs.get(j).valueOf()
)
);
case LegendHorizontalAlignment.RIGHT: {
if (orientation === LegendOrientation.VERTICAL) {
originPosX = this.mViewPortHandler.getChartWidth() - xoffset;
} else {
originPosX = this.mViewPortHandler.contentRight() - xoffset;
}
if (direction == LegendDirection.LEFT_TO_RIGHT) {
originPosX -= this.mLegend.mNeededWidth;
}
break;
}
case LegendHorizontalAlignment.CENTER: {
if (orientation == LegendOrientation.VERTICAL) {
originPosX = this.mViewPortHandler.getChartWidth() / 2.0;
} else {
originPosX = this.mViewPortHandler.contentLeft() + this.mViewPortHandler.contentWidth() / 2.0;
}
originPosX += direction === LegendDirection.LEFT_TO_RIGHT ? +xoffset : -xoffset;
if (orientation === LegendOrientation.VERTICAL) {
originPosX +=
direction === LegendDirection.LEFT_TO_RIGHT ?
-this.mLegend.mNeededWidth / 2.0 + xoffset :
this.mLegend.mNeededWidth / 2.0 - xoffset;
}
break;
}
default:
break;
}
switch ( orientation ) {
case LegendOrientation.HORIZONTAL: {
let calculatedLineSizes: JArrayList<FSize> = this.mLegend.getCalculatedLineSizes();
let calculatedLabelSizes: JArrayList<FSize> = this.mLegend.getCalculatedLabelSizes();
let calculatedLabelBreakPoints: JArrayList<Boolean> = this.mLegend.getCalculatedLabelBreakPoints();
let posX: number = originPosX;
let posY: number = 0.0;
switch ( verticalAlignment ) {
case LegendVerticalAlignment.TOP: {
posY = yoffset;
break;
}
case LegendVerticalAlignment.BOTTOM: {
posY = this.mViewPortHandler.getChartHeight() - yoffset - this.mLegend.mNeededHeight;
break;
}
case LegendVerticalAlignment.CENTER: {
posY = (this.mViewPortHandler.getChartHeight() - this.mLegend.mNeededHeight) / 2.0 + yoffset;
break;
}
default:
break;
}
let lineIndex: number = 0;
for (let i: number = 0, count = entries.length; i < count; i++) {
let x1: number = 0;
let y1: number = 0;
let x2: number = 0;
let y2: number = 0;
let e: LegendEntry = entries[i];
let drawingForm: boolean = e.form != LegendForm.NONE;
let formSize: number = Number.isNaN(e.formSize) ?
defaultFormSize : Utils.convertDpToPixel(e.formSize);
if (i < calculatedLabelBreakPoints.size() && calculatedLabelBreakPoints.get(i)) {
posX = originPosX;
posY += labelLineHeight + labelLineSpacing;
}
if (
posX == originPosX &&
horizontalAlignment == LegendHorizontalAlignment.CENTER && // "LEFT"
lineIndex < calculatedLineSizes.size()
) {
posX +=
(direction == LegendDirection.RIGHT_TO_LEFT ?
calculatedLineSizes.get(lineIndex).width :
-calculatedLineSizes.get(lineIndex).width) / 2.0;
lineIndex++;
}
let isStacked: boolean = e.label == null; // grouped forms have null labels
if (drawingForm) {
if (direction == LegendDirection.RIGHT_TO_LEFT) {
posX -= formSize;
}
x1 = posX;
y1 = posY;
paints.push(this.drawForm(posX, posY, e, this.mLegend));
if (direction == LegendDirection.LEFT_TO_RIGHT) {
posX += Utils.convertDpToPixel(formSize);
}
}
if (!isStacked) {
if (drawingForm) {
posX += direction == LegendDirection.RIGHT_TO_LEFT ? -formToTextSpace : formToTextSpace;
}
if (direction == LegendDirection.RIGHT_TO_LEFT) {
posX -= calculatedLabelSizes.get(i).width;
}
x2 = posX;
y2 = posY;
paints.push(this.drawLabel(posX, posY, e.label));
if (direction == LegendDirection.LEFT_TO_RIGHT) {
posX += Utils.calcTextWidth(this.mLegendLabelPaint, e.label);
}
posX += direction == LegendDirection.RIGHT_TO_LEFT ? -xEntrySpace : xEntrySpace;
} else {
posX += direction == LegendDirection.RIGHT_TO_LEFT ? -stackSpace : stackSpace;
}
datas.push(new Point(x1, y1, x2, y2));
}
break;
}
case LegendOrientation.VERTICAL: {
let stack: number = 0;
let wasStacked: boolean = false;
let posY: number = 0.1;
switch (verticalAlignment) {
case LegendVerticalAlignment.TOP: {
posY = horizontalAlignment == LegendHorizontalAlignment.CENTER ?
0.1 : this.mViewPortHandler.contentTop();
posY += yoffset;
break;
}
case LegendVerticalAlignment.BOTTOM: {
posY =
horizontalAlignment == LegendHorizontalAlignment.CENTER ?
this.mViewPortHandler.getChartHeight() :
this.mViewPortHandler.contentBottom();
posY -= this.mLegend.mNeededHeight + yoffset;
break;
}
case LegendVerticalAlignment.CENTER: {
posY =
this.mViewPortHandler.getChartHeight() / 2.0 -
this.mLegend.mNeededHeight / 2.0 +
this.mLegend.getYOffset();
break;
}
default:
break;
}
for (let i: number = 0; i < entries.length; i++) {
let e: LegendEntry = entries[i];
let drawingForm: boolean = e.form != LegendForm.NONE;
let formSize: number = Number.isNaN(e.formSize) ?
defaultFormSize : Utils.convertDpToPixel(e.formSize);
let posX: number = originPosX;
if (drawingForm) {
if (direction == LegendDirection.LEFT_TO_RIGHT) {
posX += stack;
} else {
posX -= formSize - stack;
}
this.mLegendFormPaint = this.drawForm(posX, posY + formYOffset, e, this.mLegend);
if (direction == LegendDirection.LEFT_TO_RIGHT) {
posX += formSize;
}
}
if (e.label != null) {
if (drawingForm && !wasStacked) {
posX += direction == LegendDirection.LEFT_TO_RIGHT ? formToTextSpace : -formToTextSpace;
} else if (wasStacked) {
posX = originPosX;
}
if (direction == LegendDirection.RIGHT_TO_LEFT) {
posX -= Utils.calcTextWidth(this.mLegendLabelPaint[i], e.label);
}
if (!wasStacked) {
this.mLegendLabelPaint = this.drawLabel(posX, posY + formYOffset, e.label);
} else {
posY += formYOffset + labelLineSpacing;
this.mLegendLabelPaint = this.drawLabel(posX, posY + formYOffset, e.label);
}
posY += formYOffset + labelLineSpacing;
stack = 0;
} else {
stack += formSize + stackSpace;
wasStacked = true;
}
paints.push(this.mLegendFormPaint);
paints.push(this.mLegendLabelPaint);
}
break;
}
default:
break;
}
}
if (this.mLegend.getExtraEntries() != null) {
let datas: LegendEntry[] = this.mLegend.getExtraEntries();
for (let i: number = 0; i < datas.length; i++) {
this.computedEntries.add(datas[i]);
}
}
this.mLegend.setEntries(this.computedEntries);
return paints;
}
let tf: FontWeight /*Typeface*/ = this.mLegend.getTypeface();
if (tf != null) {
this.mLegendLabelPaint.setTypeface(tf);
}
this.mLegendLabelPaint.setTextSize(this.mLegend.getTextSize());
this.mLegendLabelPaint.setColor(this.mLegend.getTextColor());
this.mLegend.calculateDimensions(this.mLegendLabelPaint, this.mViewPortHandler);
}
protected legendFontMetrics: FontMetrics = new FontMetrics();
public renderLegend(): Paint[] {
let datas: Point[] = [];
if (!this.mLegend.isEnabled()) {
return;
}
let tf: FontWeight = this.mLegend.getTypeface();
if (tf != null) {
this.mLegendLabelPaint.setTypeface(tf);
}
this.mLegendLabelPaint.setTextSize(this.mLegend.getTextSize());
this.mLegendLabelPaint.setColor(this.mLegend.getTextColor());
let labelLineHeight: number = Utils.getLineHeight(this.mLegendLabelPaint);
let labelLineSpacing: number = Utils.getLineSpacing(this.mLegendLabelPaint) + this.mLegend.getYEntrySpace();
let formYOffset: number = labelLineHeight - Utils.calcTextHeight(this.mLegendLabelPaint, 'ABC') / 2.0;
let entries: LegendEntry[] = this.mLegend.getEntries();
let formToTextSpace: number = this.mLegend.getFormToTextSpace();
let xEntrySpace: number = this.mLegend.getXEntrySpace();
let orientation: LegendOrientation = this.mLegend.getOrientation(); // "HORIZONTAL" ͼ<><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
let horizontalAlignment: LegendHorizontalAlignment = this.mLegend.getHorizontalAlignment(); // "LEFT" ˮƽ<CBAE><C6BD><EFBFBD>뷽ʽ
let verticalAlignment: LegendVerticalAlignment = this.mLegend.getVerticalAlignment(); // "BOTTOM
let direction: LegendDirection = this.mLegend.getDirection(); // "LEFT_TO_RIGHT" ͼ<><CDBC><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD>
let defaultFormSize: number = this.mLegend.getFormSize();
let stackSpace: number = this.mLegend.getStackSpace();
let yoffset: number = this.mLegend.getYOffset();
let xoffset: number = this.mLegend.getXOffset();
let originPosX: number = 0.0;
let paints: Paint[] = [];
switch (horizontalAlignment) {
case LegendHorizontalAlignment.LEFT: {
if (orientation == LegendOrientation.VERTICAL) {
originPosX = xoffset;
} else {
originPosX = this.mViewPortHandler.contentLeft() + xoffset;
}
console.log(
'1. originPosX(' +
JSON.stringify(originPosX) +
')= xoffset(' +
xoffset +
') + mViewPortHandler.contentLeft(' +
this.mViewPortHandler.contentLeft() +
')'
);
if (direction == LegendDirection.RIGHT_TO_LEFT) {
originPosX += this.mLegend.mNeededWidth;
}
break;
}
case LegendHorizontalAlignment.RIGHT: {
if (orientation == LegendOrientation.VERTICAL) {
originPosX = this.mViewPortHandler.getChartWidth() - xoffset;
} else {
originPosX = this.mViewPortHandler.contentRight() - xoffset;
}
if (direction == LegendDirection.LEFT_TO_RIGHT) {
originPosX -= this.mLegend.mNeededWidth;
}
break;
}
case LegendHorizontalAlignment.CENTER: {
if (orientation == LegendOrientation.VERTICAL) {
originPosX = this.mViewPortHandler.getChartWidth() / 2.0;
} else {
originPosX = this.mViewPortHandler.contentLeft() + this.mViewPortHandler.contentWidth() / 2.0;
}
originPosX += direction == LegendDirection.LEFT_TO_RIGHT ? +xoffset : -xoffset;
if (orientation == LegendOrientation.VERTICAL) {
originPosX +=
direction == LegendDirection.LEFT_TO_RIGHT ?
-this.mLegend.mNeededWidth / 2.0 + xoffset :
this.mLegend.mNeededWidth / 2.0 - xoffset;
}
break;
}
default:
break;
}
switch (
orientation // "HORIZONTAL"
) {
case LegendOrientation.HORIZONTAL: {
let calculatedLineSizes: JArrayList<FSize> = this.mLegend.getCalculatedLineSizes();
let calculatedLabelSizes: JArrayList<FSize> = this.mLegend.getCalculatedLabelSizes();
let calculatedLabelBreakPoints: JArrayList<Boolean> = this.mLegend.getCalculatedLabelBreakPoints();
let posX: number = originPosX;
let posY: number = 0.0;
switch (
verticalAlignment // "BOTTOM"
/**
* Draws the Legend-form at the given position with the color at the given
* index.
*
* @param c canvas to draw with
* @param x position
* @param y position
* @param entry the entry to render
* @param legend the legend context
*/
protected drawForm(x: number, y: number, entry: LegendEntry, legend: Legend): Paint {
if (
entry.formColor == ColorTemplate.COLOR_SKIP ||
entry.formColor == ColorTemplate.COLOR_NONE ||
entry.formColor == 0
) {
case LegendVerticalAlignment.TOP: {
posY = yoffset;
console.log('2.0 posY(' + JSON.stringify(posY) + ')= yoffset(' + yoffset + ')');
break;
}
case LegendVerticalAlignment.BOTTOM: {
posY = this.mViewPortHandler.getChartHeight() - yoffset - this.mLegend.mNeededHeight;
console.log(
'2.1 posY(' +
posY +
')= mViewPortHandler.getChartHeight(' +
this.mViewPortHandler.getChartHeight() +
')-mNeededHeight(' +
this.mLegend.mNeededHeight +
')-yoffset(' +
yoffset +
')'
);
break;
}
case LegendVerticalAlignment.CENTER: {
posY = (this.mViewPortHandler.getChartHeight() - this.mLegend.mNeededHeight) / 2.0 + yoffset;
console.log(
'2.1 posY(' +
posY +
')= mViewPortHandler.getChartHeight(' +
this.mViewPortHandler.getChartHeight() +
')-mNeededHeight/2(' +
this.mLegend.mNeededHeight / 2 +
')+yoffset(' +
yoffset +
')'
);
break;
}
default:
break;
return;
}
let lineIndex: number = 0;
for (let i: number = 0, count = entries.length; i < count; i++) {
let x1: number = 0;
let y1: number = 0;
let x2: number = 0;
let y2: number = 0;
let e: LegendEntry = entries[i];
let drawingForm: boolean = e.form != LegendForm.NONE;
let formSize: number = Number.isNaN(e.formSize) ?
defaultFormSize : Utils.convertDpToPixel(e.formSize);
if (i < calculatedLabelBreakPoints.size() && calculatedLabelBreakPoints.get(i)) {
posX = originPosX;
posY += labelLineHeight + labelLineSpacing;
console.log(
'3.0 i(' +
i +
') posX=' +
posX +
'; posY(' +
posY +
')=labelLineHeight(' +
labelLineHeight +
')+labelLineSpacing(' +
labelLineSpacing +
')'
);
}
if (
posX == originPosX &&
horizontalAlignment == LegendHorizontalAlignment.CENTER && // "LEFT"
lineIndex < calculatedLineSizes.size()
) {
posX +=
(direction == LegendDirection.RIGHT_TO_LEFT ?
calculatedLineSizes.get(lineIndex).width :
-calculatedLineSizes.get(lineIndex).width) / 2.0;
lineIndex++;
}
let isStacked: boolean = e.label == null; // grouped forms have null labels
if (drawingForm) {
if (direction == LegendDirection.RIGHT_TO_LEFT) {
posX -= formSize;
}
x1 = posX;
y1 = posY;
console.log(
'3.1 i(' + i + ') drawForm <==> posX=' + posX + '; posY(' + posY + ')+formYOffset(' + formYOffset + ')'
);
paints.push(this.drawForm(posX, posY, e, this.mLegend));
if (direction == LegendDirection.LEFT_TO_RIGHT) {
console.log(
'3.2 i(' +
i +
') posX(' +
posX +
')+=Utils.convertDpToPixel(formSize)(' +
Utils.convertDpToPixel(formSize) +
')'
);
posX += Utils.convertDpToPixel(formSize);
}
}
if (!isStacked) {
if (drawingForm) {
console.log('3.3 i(' + i + ') posX(' + posX + ')+=formToTextSpace(' + formToTextSpace + ')');
posX += direction == LegendDirection.RIGHT_TO_LEFT ? -formToTextSpace : formToTextSpace;
}
if (direction == LegendDirection.RIGHT_TO_LEFT) {
posX -= calculatedLabelSizes.get(i).width;
}
x2 = posX;
y2 = posY;
console.log(
'3.4 i(' + i + ') drawLabel <==> posX=' + posX + '; posY(' + posY + ')+formYOffset(' + formYOffset + ')'
);
paints.push(this.drawLabel(posX, posY, e.label));
if (direction == LegendDirection.LEFT_TO_RIGHT) {
console.log(
'3.5 i(' +
i +
') posX(' +
posX +
')+=calcTextWidth(' +
JSON.stringify(Utils.calcTextWidth(this.mLegendLabelPaint, e.label)) +
')'
);
posX += Utils.calcTextWidth(this.mLegendLabelPaint, e.label);
}
console.log(
'3.6 i(' + i + ') posX(' + posX + ')+=xEntrySpace(' + xEntrySpace + '); stackSpace(' + stackSpace + ')'
);
posX += direction == LegendDirection.RIGHT_TO_LEFT ? -xEntrySpace : xEntrySpace;
} else posX += direction == LegendDirection.RIGHT_TO_LEFT ? -stackSpace : stackSpace;
datas.push(new Point(x1, y1, x2, y2));
let form: LegendForm = entry.form;
if (form == LegendForm.DEFAULT) {
form = legend.getForm();
}
break;
}
case LegendOrientation.VERTICAL: {
let stack: number = 0;
let wasStacked: boolean = false;
let posY: number = 0.1;
switch (verticalAlignment) {
case LegendVerticalAlignment.TOP: {
posY = horizontalAlignment == LegendHorizontalAlignment.CENTER ?
0.1 : this.mViewPortHandler.contentTop();
posY += yoffset;
break;
}
case LegendVerticalAlignment.BOTTOM: {
posY =
horizontalAlignment == LegendHorizontalAlignment.CENTER ?
this.mViewPortHandler.getChartHeight() :
this.mViewPortHandler.contentBottom();
posY -= this.mLegend.mNeededHeight + yoffset;
break;
}
case LegendVerticalAlignment.CENTER: {
posY =
this.mViewPortHandler.getChartHeight() / 2.0 -
this.mLegend.mNeededHeight / 2.0 +
this.mLegend.getYOffset();
break;
}
default:
break;
let formSize: number = Utils.convertDpToPixel(Number.isNaN(entry.formSize) ?
legend.getFormSize() : entry.formSize);
let half: number = formSize / 2;
switch (form) {
case LegendForm.NONE:
// Do nothing
break;
case LegendForm.EMPTY:
// Do not draw, but keep space for the form
break;
case LegendForm.DEFAULT:
case LegendForm.CIRCLE: {
let circlePaint: CirclePaint = new CirclePaint(); //= this.mLegendFormPaint as CirclePaint;
circlePaint.setColor(entry.formColor);
circlePaint.setStyle(Style.FILL);
circlePaint.setX(x + half);
circlePaint.setY(y);
circlePaint.setWidth(half);
circlePaint.setHeight(half);
return circlePaint;
break;
}
case LegendForm.SQUARE: {
let rectPaint: RectPaint = new RectPaint(); //= this.mLegendFormPaint as RectPaint;
rectPaint.setStroke(entry.formColor);
rectPaint.setStyle(Style.FILL);
rectPaint.setStartPoint([x, y]);
rectPaint.setWidth(formSize);
rectPaint.setHeight(half);
return rectPaint;
break;
}
case LegendForm.LINE: {
let linePaint: LinePaint; //= this.mLegendFormPaint as LinePaint;
let formLineWidth: number = Utils.convertDpToPixel(
Number.isNaN(entry.formLineWidth) ? legend.getFormLineWidth() : entry.formLineWidth
);
linePaint.setStyle(Style.STROKE);
linePaint.setStrokeWidth(formLineWidth);
linePaint.setStartPoint([x, y]);
linePaint.setEndPoint([x + formSize, y]);
return linePaint;
break;
}
default:
break;
}
for (let i: number = 0; i < entries.length; i++) {
let e: LegendEntry = entries[i];
let drawingForm: boolean = e.form != LegendForm.NONE;
let formSize: number = Number.isNaN(e.formSize) ?
defaultFormSize : Utils.convertDpToPixel(e.formSize);
let posX: number = originPosX;
if (drawingForm) {
if (direction == LegendDirection.LEFT_TO_RIGHT) {
posX += stack;
} else {
posX -= formSize - stack;
}
this.mLegendFormPaint = this.drawForm(posX, posY + formYOffset, e, this.mLegend);
if (direction == LegendDirection.LEFT_TO_RIGHT) {
posX += formSize;
}
}
if (e.label != null) {
if (drawingForm && !wasStacked) {
posX += direction == LegendDirection.LEFT_TO_RIGHT ? formToTextSpace : -formToTextSpace;
} else if (wasStacked) {
posX = originPosX;
}
if (direction == LegendDirection.RIGHT_TO_LEFT) {
posX -= Utils.calcTextWidth(this.mLegendLabelPaint[i], e.label);
}
if (!wasStacked) {
this.mLegendLabelPaint = this.drawLabel(posX, posY + formYOffset, e.label);
} else {
posY += formYOffset + labelLineSpacing;
this.mLegendLabelPaint = this.drawLabel(posX, posY + formYOffset, e.label);
}
posY += formYOffset + labelLineSpacing;
stack = 0;
} else {
stack += formSize + stackSpace;
wasStacked = true;
}
paints.push(this.mLegendFormPaint);
paints.push(this.mLegendLabelPaint);
}
break;
}
default:
break;
}
console.log('6. LegendRenderer datas:' + JSON.stringify(datas));
return paints;
}
/**
* Draws the Legend-form at the given position with the color at the given
* index.
*
* @param c canvas to draw with
* @param x position
* @param y position
* @param entry the entry to render
* @param legend the legend context
*/
protected drawForm(x: number, y: number, entry: LegendEntry, legend: Legend): Paint {
if (
entry.formColor == ColorTemplate.COLOR_SKIP ||
entry.formColor == ColorTemplate.COLOR_NONE ||
entry.formColor == 0
) {
return;
}
let form: LegendForm = entry.form;
if (form == LegendForm.DEFAULT) {
form = legend.getForm();
/**
* Draws the provided label at the given position.
*
* @param c to draw with
* @param x
* @param y
* @param label the label to draw
*/
protected drawLabel(x: number, y: number, label: string): Paint {
let textPaint: TextPaint = new TextPaint(this.mLegendLabelPaint as TextPaint);
textPaint.setText(label);
textPaint.setX(x);
textPaint.setY(y);
return textPaint;
}
let formSize: number = Utils.convertDpToPixel(Number.isNaN(entry.formSize) ?
legend.getFormSize() : entry.formSize);
let half: number = formSize / 2;
switch (form) {
case LegendForm.NONE:
// Do nothing
break;
case LegendForm.EMPTY:
// Do not draw, but keep space for the form
break;
case LegendForm.DEFAULT:
case LegendForm.CIRCLE: {
let circlePaint: CirclePaint = new CirclePaint(); //= this.mLegendFormPaint as CirclePaint;
circlePaint.setColor(entry.formColor);
circlePaint.setStyle(Style.FILL);
circlePaint.setX(x + half);
circlePaint.setY(y);
circlePaint.setWidth(half);
circlePaint.setHeight(half);
return circlePaint;
break;
}
case LegendForm.SQUARE: {
let rectPaint: RectPaint = new RectPaint(); //= this.mLegendFormPaint as RectPaint;
rectPaint.setStroke(entry.formColor);
rectPaint.setStyle(Style.FILL);
rectPaint.setStartPoint([x, y]);
rectPaint.setWidth(formSize);
rectPaint.setHeight(half);
return rectPaint;
break;
}
case LegendForm.LINE: {
let linePaint: LinePaint; //= this.mLegendFormPaint as LinePaint;
let formLineWidth: number = Utils.convertDpToPixel(
Number.isNaN(entry.formLineWidth) ? legend.getFormLineWidth() : entry.formLineWidth
);
linePaint.setStyle(Style.STROKE);
linePaint.setStrokeWidth(formLineWidth);
linePaint.setStartPoint([x, y]);
linePaint.setEndPoint([x + formSize, y]);
return linePaint;
break;
}
default:
break;
}
}
/**
* Draws the provided label at the given position.
*
* @param c to draw with
* @param x
* @param y
* @param label the label to draw
*/
protected drawLabel(x: number, y: number, label: string): Paint {
let textPaint: TextPaint = new TextPaint(this.mLegendLabelPaint as TextPaint);
textPaint.setText(label);
textPaint.setX(x);
textPaint.setY(y);
return textPaint;
}
}

2
host/smartperf/client/client_ui/entry/src/main/module.json
View File

@ -47,7 +47,7 @@
"name": "MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:MainAbility_desc",
"icon": "$media:logo",
"icon": "$media:logo_set",
"label": "$string:MainAbility_label",
"visible": true,
"skills": [