openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 07:01:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!44964 【dfx】增加drawaingLattice的dfx能力

Browse Source 
Merge pull request !44964 from 吴寅潇/addDrawingLatticeDfx
This commit is contained in:
openharmony_ci 2024-10-17 06:35:04 +00:00 committed by Gitee
commit e5d5cc071e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 135 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
adapter/ohos/osal/drawing_lattice_ohos.cpp
View File

@ -37,4 +37,25 @@ void* DrawingLatticeOhos::GetDrawingLatticeSptrAddr()
{
return static_cast<void*>(&lattice_);
}
std::string DrawingLatticeOhos::DumpToString()
{
if (lattice_) {
std::string drawingConfigStr;
drawingConfigStr.append("fXCount = " + std::to_string(lattice_->fXCount));
drawingConfigStr.append("fXDivs = [");
for (int32_t idx = 0; idx < lattice_->fXCount; ++idx) {
drawingConfigStr.append(std::to_string(lattice_->fXDivs[idx]) + " ");
}
drawingConfigStr.append("] ");
drawingConfigStr.append("fYCount = " + std::to_string(lattice_->fYCount));
drawingConfigStr.append("fYDivs = [");
for (int32_t idx = 0; idx < lattice_->fYCount; ++idx) {
drawingConfigStr.append(std::to_string(lattice_->fYDivs[idx]) + " ");
}
drawingConfigStr.append("] ");
return drawingConfigStr;
}
return "Lattice is null";
}
} // namespace OHOS::Ace

1
adapter/ohos/osal/drawing_lattice_ohos.h
View File

@ -29,6 +29,7 @@ public:
: lattice_(std::move(lattice)) {}
~DrawingLatticeOhos() override = default;
void* GetDrawingLatticeSptrAddr() override;
std::string DumpToString() override;
private:
std::shared_ptr<Rosen::Drawing::Lattice> lattice_;

21
adapter/preview/osal/drawing_lattice_preview.cpp
View File

@ -40,4 +40,25 @@ void* DrawingLatticePreview::GetDrawingLatticeSptrAddr()
{
return static_cast<void*>(&lattice_);
}
std::string DrawingLatticePreview::DumpToString()
{
if (lattice_) {
std::string drawingConfigStr;
drawingConfigStr.append("fXCount = " + std::to_string(lattice_->fXCount));
drawingConfigStr.append("fXDivs = [");
for (int32_t idx = 0; idx < lattice_->fXCount; ++idx) {
drawingConfigStr.append(std::to_string(lattice_->fXDivs[idx]) + " ");
}
drawingConfigStr.append("] ");
drawingConfigStr.append("fYCount = " + std::to_string(lattice_->fYCount));
drawingConfigStr.append("fYDivs = [");
for (int32_t idx = 0; idx < lattice_->fYCount; ++idx) {
drawingConfigStr.append(std::to_string(lattice_->fYDivs[idx]) + " ");
}
drawingConfigStr.append("] ");
return drawingConfigStr;
}
return "Lattice is null";
}
} // namespace OHOS::Ace

1
adapter/preview/osal/drawing_lattice_preview.h
View File

@ -27,6 +27,7 @@ public:
: lattice_(std::move(lattice)) {}
~DrawingLatticePreview() override = default;
void* GetDrawingLatticeSptrAddr() override;
std::string DumpToString() override;
private:
std::shared_ptr<Rosen::Drawing::Lattice> lattice_;

1
frameworks/base/image/drawing_lattice.h
View File

@ -27,6 +27,7 @@ public:
static RefPtr<DrawingLattice> CreateDrawingLattice(void* sptrAddr);
static RefPtr<DrawingLattice> CreateDrawingLatticeFromNative(void* sptrAddr);
virtual void* GetDrawingLatticeSptrAddr() = 0; //define the return value as void is for tdd compilation
virtual std::string DumpToString() = 0;
};
} // namespace Ace

83
frameworks/core/components_ng/pattern/image/image_pattern.cpp
View File

@ -1362,27 +1362,52 @@ void ImagePattern::DumpLayoutInfo()
{
auto layoutProp = GetLayoutProperty<ImageLayoutProperty>();
CHECK_NULL_VOID(layoutProp);
DumpImageSourceInfo(layoutProp);
DumpAltSourceInfo(layoutProp);
DumpImageFit(layoutProp);
DumpFitOriginalSize(layoutProp);
DumpSourceSize(layoutProp);
DumpAutoResize(layoutProp);
}
inline void ImagePattern::DumpImageSourceInfo(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp)
{
auto src = layoutProp->GetImageSourceInfo().value_or(ImageSourceInfo(""));
DumpLog::GetInstance().AddDesc(std::string("url: ").append(src.ToString()));
DumpLog::GetInstance().AddDesc("SrcCacheKey: " + src.GetKey());
}
inline void ImagePattern::DumpAltSourceInfo(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp)
{
auto altSrc = layoutProp->GetAlt().value_or(ImageSourceInfo(""));
DumpLog::GetInstance().AddDesc(std::string("altUrl: ").append(altSrc.ToString()));
}
inline void ImagePattern::DumpImageFit(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp)
{
auto imageFit = layoutProp->GetImageFit().value_or(ImageFit::COVER);
DumpLog::GetInstance().AddDesc(std::string("objectFit: ").append(GetImageFitStr(imageFit)));
}
inline void ImagePattern::DumpFitOriginalSize(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp)
{
auto fitOriginalSize = layoutProp->GetFitOriginalSize().value_or(false);
DumpLog::GetInstance().AddDesc(std::string("fitOriginalSize: ").append(fitOriginalSize ? "true" : "false"));
}
inline void ImagePattern::DumpSourceSize(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp)
{
const std::optional<SizeF>& sourceSize = layoutProp->GetSourceSize();
if (sourceSize.has_value()) {
DumpLog::GetInstance().AddDesc(std::string("sourceSize: ").append(sourceSize.value().ToString()));
}
}
inline void ImagePattern::DumpAutoResize(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp)
{
bool autoResize = layoutProp->GetAutoResize().value_or(autoResizeDefault_);
autoResize ? DumpLog::GetInstance().AddDesc("autoResize:true")
: DumpLog::GetInstance().AddDesc("autoResize:false");
autoResize ? DumpLog::GetInstance().AddDesc("autoResize:true") : DumpLog::GetInstance().AddDesc("autoResize:false");
}
void ImagePattern::DumpRenderInfo()
@ -1390,51 +1415,92 @@ void ImagePattern::DumpRenderInfo()
auto renderProp = GetPaintProperty<ImageRenderProperty>();
CHECK_NULL_VOID(renderProp);
DumpRenderMode(renderProp);
DumpImageRepeat(renderProp);
DumpImageColorFilter(renderProp);
DumpFillColor(renderProp);
DumpDynamicRangeMode(renderProp);
DumpMatchTextDirection(renderProp);
DumpSmoothEdge(renderProp);
DumpBorderRadiusProperties(renderProp);
DumpResizable(renderProp);
}
inline void ImagePattern::DumpRenderMode(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
auto imageRenderMode = renderProp->GetImageRenderMode().value_or(ImageRenderMode::ORIGINAL);
DumpLog::GetInstance().AddDesc(
std::string("renderMode: ").append((imageRenderMode == ImageRenderMode::ORIGINAL) ? "Original" : "Template"));
}
inline void ImagePattern::DumpImageRepeat(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
auto imageRepeat = renderProp->GetImageRepeat().value_or(ImageRepeat::NO_REPEAT);
DumpLog::GetInstance().AddDesc(std::string("objectRepeat: ").append(GetImageRepeatStr(imageRepeat)));
}
inline void ImagePattern::DumpImageColorFilter(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
auto imageColorFilter = renderProp->GetColorFilter();
if (imageColorFilter.has_value()) {
auto colorFilter = imageColorFilter.value();
DumpLog::GetInstance().AddDesc(std::string("colorFilter: ").append(GetImageColorFilterStr(colorFilter)));
}
}
inline void ImagePattern::DumpFillColor(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
auto fillColor = renderProp->GetSvgFillColor();
if (fillColor.has_value()) {
auto color = fillColor.value();
DumpLog::GetInstance().AddDesc(std::string("fillColor: ").append(color.ColorToString()));
}
}
inline void ImagePattern::DumpDynamicRangeMode(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
DynamicRangeMode dynamicMode = DynamicRangeMode::STANDARD;
if (renderProp->HasDynamicMode()) {
dynamicMode = renderProp->GetDynamicMode().value_or(DynamicRangeMode::STANDARD);
DumpLog::GetInstance().AddDesc(std::string("dynamicRangeMode: ").append(GetDynamicModeString(dynamicMode)));
}
}
inline void ImagePattern::DumpMatchTextDirection(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
auto matchTextDirection = renderProp->GetMatchTextDirection().value_or(false);
matchTextDirection ? DumpLog::GetInstance().AddDesc("matchTextDirection:true")
: DumpLog::GetInstance().AddDesc("matchTextDirection:false");
}
inline void ImagePattern::DumpSmoothEdge(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
auto smoothEdge = renderProp->GetSmoothEdge();
if (smoothEdge.has_value()) {
DumpLog::GetInstance().AddDesc(std::string("edgeAntialiasing: ").append(std::to_string(smoothEdge.value())));
}
}
inline void ImagePattern::DumpResizable(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
if (renderProp->HasImageResizableSlice() && renderProp->GetImageResizableSliceValue({}).Valid()) {
DumpLog::GetInstance().AddDesc(
std::string("resizable slice: ").append(renderProp->GetImageResizableSliceValue({}).ToString()));
}
auto resizableLattice = renderProp->GetImageResizableLatticeValue(nullptr);
DumpLog::GetInstance().AddDesc(
"resizableLattice:" + (resizableLattice ? resizableLattice->DumpToString() : "Lattice is null"));
}
void ImagePattern::DumpBorderRadiusProperties(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp)
{
auto needBorderRadius = renderProp->GetNeedBorderRadius().value_or(false);
needBorderRadius ? DumpLog::GetInstance().AddDesc("needBorderRadius:true")
: DumpLog::GetInstance().AddDesc("needBorderRadius:false");
auto borderRadius = renderProp->GetBorderRadius().value_or(BorderRadiusProperty());
DumpLog::GetInstance().AddDesc(borderRadius.ToString());
if (renderProp && renderProp->HasImageResizableSlice() && renderProp->GetImageResizableSliceValue({}).Valid()) {
DumpLog::GetInstance().AddDesc(
std::string("resizable slice: ").append(renderProp->GetImageResizableSliceValue({}).ToString()));
}
DumpLog::GetInstance().AddDesc("ImageBorderRadius:" + borderRadius.ToString());
auto host = GetHost();
CHECK_NULL_VOID(host);
@ -1447,6 +1513,7 @@ void ImagePattern::DumpRenderInfo()
DumpLog::GetInstance().AddDesc("borderRadius: null");
}
}
void ImagePattern::DumpSvgInfo()
{
auto imageLayoutProperty = GetLayoutProperty<ImageLayoutProperty>();

15
frameworks/core/components_ng/pattern/image/image_pattern.h
View File

@ -215,8 +215,23 @@ public:
void DumpInfo(std::unique_ptr<JsonValue>& json) override;
void DumpSimplifyInfo(std::unique_ptr<JsonValue>& json) override {}
void DumpLayoutInfo();
inline void DumpImageSourceInfo(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp);
inline void DumpAltSourceInfo(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp);
inline void DumpImageFit(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp);
inline void DumpFitOriginalSize(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp);
inline void DumpSourceSize(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp);
inline void DumpAutoResize(const RefPtr<OHOS::Ace::NG::ImageLayoutProperty>& layoutProp);
void DumpLayoutInfo(std::unique_ptr<JsonValue>& json);
void DumpRenderInfo();
inline void DumpRenderMode(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
inline void DumpImageRepeat(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
inline void DumpImageColorFilter(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
inline void DumpFillColor(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
inline void DumpDynamicRangeMode(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
inline void DumpMatchTextDirection(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
inline void DumpSmoothEdge(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
inline void DumpResizable(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
void DumpBorderRadiusProperties(const RefPtr<OHOS::Ace::NG::ImageRenderProperty>& renderProp);
void DumpRenderInfo(std::unique_ptr<JsonValue>& json);
void DumpAdvanceInfo() override;
void DumpAdvanceInfo(std::unique_ptr<JsonValue>& json) override;