[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - 6 commits - basegfx/CppunitTest_basegfx.mk basegfx/test cui/source cui/uiconfig include/basegfx include/sfx2 include/vcl officecfg/registry Repository.mk sfx2/Library_sfx.mk sfx2/sdi sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk vcl/backendtest vcl/Executable_benchmark.mk vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/qa vcl/source
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Sun Mar 7 04:55:26 UTC 2021
Rebased ref, commits from common ancestor:
commit 92d73591cf097f6ae5288b7ee6d86ae1838e90db
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Mar 7 13:48:39 2021 +0900
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sun Mar 7 13:54:21 2021 +0900
vcl: add PNG writer based on libpng
Change-Id: I52ffd1b286162ee0dd9f694c4f3210385f71daf8
diff --git a/include/vcl/filter/PngImageWriter.hxx b/include/vcl/filter/PngImageWriter.hxx
new file mode 100644
index 000000000000..5d90b5261be4
--- /dev/null
+++ b/include/vcl/filter/PngImageWriter.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include <vcl/dllapi.h>
+#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <tools/stream.hxx>
+#include <vcl/bitmapex.hxx>
+
+#pragma once
+
+namespace vcl
+{
+class VCL_DLLPUBLIC PngImageWriter
+{
+ SvStream& mrStream;
+ css::uno::Reference<css::task::XStatusIndicator> mxStatusIndicator;
+
+public:
+ PngImageWriter(SvStream& rStream);
+
+ virtual ~PngImageWriter() {}
+
+ bool write(BitmapEx& rBitmap);
+};
+
+} // namespace vcl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ea4d86b26e57..38a4aa617ade 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -477,6 +477,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/filter/wmf/wmfexternal \
vcl/source/filter/wmf/wmfwr \
vcl/source/filter/png/PngImageReader \
+ vcl/source/filter/png/PngImageWriter \
vcl/source/filter/png/pngread \
vcl/source/filter/png/pngwrite \
vcl/source/font/Feature \
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx b/vcl/qa/cppunit/png/PngFilterTest.cxx
index 28e6c719f6fd..ed1a830138aa 100644
--- a/vcl/qa/cppunit/png/PngFilterTest.cxx
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -24,8 +24,11 @@
#include <test/bootstrapfixture.hxx>
#include <tools/stream.hxx>
#include <vcl/filter/PngImageReader.hxx>
+#include <vcl/filter/PngImageWriter.hxx>
#include <vcl/BitmapReadAccess.hxx>
+#include <bitmap/BitmapWriteAccess.hxx>
#include <vcl/alpha.hxx>
+#include <unotools/tempfile.hxx>
using namespace css;
@@ -46,12 +49,57 @@ public:
}
void testPng();
+ void testPngWriting();
CPPUNIT_TEST_SUITE(PngFilterTest);
CPPUNIT_TEST(testPng);
+ CPPUNIT_TEST(testPngWriting);
CPPUNIT_TEST_SUITE_END();
};
+void PngFilterTest::testPngWriting()
+{
+ utl::TempFile aTempFile;
+ aTempFile.EnableKillingFile();
+ {
+ SvStream& rStream = *aTempFile.GetStream(StreamMode::WRITE);
+ Bitmap aBitmap(Size(16, 16), 24);
+ {
+ BitmapScopedWriteAccess pWriteAccess(aBitmap);
+ pWriteAccess->Erase(COL_BLACK);
+ for (int i = 0; i < 8; ++i)
+ {
+ for (int j = 0; j < 8; ++j)
+ {
+ pWriteAccess->SetPixel(i, j, COL_LIGHTRED);
+ }
+ }
+ for (int i = 8; i < 16; ++i)
+ {
+ for (int j = 8; j < 16; ++j)
+ {
+ pWriteAccess->SetPixel(i, j, COL_LIGHTBLUE);
+ }
+ }
+ }
+ BitmapEx aBitmapEx(aBitmap);
+
+ vcl::PngImageWriter aPngWriter(rStream);
+ CPPUNIT_ASSERT_EQUAL(true, aPngWriter.write(aBitmapEx));
+ }
+ {
+ SvStream& rStream = *aTempFile.GetStream(StreamMode::READ);
+ rStream.Seek(0);
+
+ vcl::PngImageReader aPngReader(rStream);
+ BitmapEx aBitmapEx;
+ CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
+
+ CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+ }
+}
+
void PngFilterTest::testPng()
{
for (const OUString& aFileName : { OUString("rect-1bit-pal.png") })
diff --git a/vcl/source/filter/png/PngImageWriter.cxx b/vcl/source/filter/png/PngImageWriter.cxx
new file mode 100644
index 000000000000..222e5308da68
--- /dev/null
+++ b/vcl/source/filter/png/PngImageWriter.cxx
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include <vcl/filter/PngImageWriter.hxx>
+#include <png.h>
+#include <bitmap/BitmapWriteAccess.hxx>
+#include <vcl/bitmap.hxx>
+
+namespace vcl
+{
+static void lclWriteStream(png_structp pPng, png_bytep pData, png_size_t pDataSize)
+{
+ png_voidp pIO = png_get_io_ptr(pPng);
+
+ if (pIO == nullptr)
+ return;
+
+ SvStream* pStream = static_cast<SvStream*>(pIO);
+
+ sal_Size nBytesWritten = pStream->WriteBytes(pData, pDataSize);
+
+ if (nBytesWritten != pDataSize)
+ png_error(pPng, "Write Error");
+}
+
+bool pngWrite(SvStream& rStream, BitmapEx& rBitmapEx)
+{
+ png_structp pPng = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
+
+ if (!pPng)
+ return false;
+
+ png_infop pInfo = png_create_info_struct(pPng);
+ if (!pInfo)
+ {
+ png_destroy_write_struct(&pPng, nullptr);
+ return false;
+ }
+
+ if (setjmp(png_jmpbuf(pPng)))
+ {
+ png_destroy_read_struct(&pPng, &pInfo, nullptr);
+ return false;
+ }
+
+ // Set our custom stream writer
+ png_set_write_fn(pPng, &rStream, lclWriteStream, nullptr);
+
+ Size aSize = rBitmapEx.GetSizePixel();
+
+ // Basic image settings
+ int bitDepth = 8;
+ int colorType = PNG_COLOR_TYPE_RGB;
+ int interlaceType = PNG_INTERLACE_NONE;
+ int compressionType = PNG_COMPRESSION_TYPE_DEFAULT;
+ int filterMethod = PNG_FILTER_TYPE_DEFAULT;
+
+ png_set_IHDR(pPng, pInfo, aSize.Width(), aSize.Height(), bitDepth, colorType, interlaceType,
+ compressionType, filterMethod);
+
+ png_write_info(pPng, pInfo);
+
+ int nNumberOfPasses = 1;
+
+ Bitmap aBitmap = rBitmapEx.GetBitmap();
+ {
+ Scanline pSourcePointer;
+ Bitmap::ScopedReadAccess pAccess(aBitmap);
+ tools::Long nHeight = pAccess->Height();
+
+ for (int nPass = 0; nPass < nNumberOfPasses; nPass++)
+ {
+ for (tools::Long y = 0; y <= nHeight; y++)
+ {
+ pSourcePointer = pAccess->GetScanline(y);
+ png_write_rows(pPng, &pSourcePointer, 1);
+ }
+ }
+ }
+
+ png_write_end(pPng, pInfo);
+
+ png_destroy_write_struct(&pPng, &pInfo);
+
+ return true;
+}
+
+PngImageWriter::PngImageWriter(SvStream& rStream)
+ : mrStream(rStream)
+{
+}
+
+bool PngImageWriter::write(BitmapEx& rBitmapEx) { return pngWrite(mrStream, rBitmapEx); }
+
+} // namespace vcl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 575d5c99f827f569bd1bbba721127c3772e132c5
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue May 22 14:44:39 2018 +0900
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sun Mar 7 13:51:04 2021 +0900
Command Popup
Change-Id: I92cdd3130b8de42ee0863c9e7154e7c7246d9377
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 3f9d4a232fb7..e2a9a8cdaab6 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -385,7 +385,7 @@ class SvxSearchItem;
// default-ids for windows
-// free (SID_SFX_START + 610)
+#define SID_COMMAND_POPUP (SID_SFX_START + 610)
#define SID_NEWWINDOW (SID_SFX_START + 620)
#define SID_CLOSEWIN (SID_SFX_START + 621)
#define SID_VIEWSHELL (SID_SFX_START + 623)
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 967aa98a04db..8f95ee9125aa 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -313,6 +313,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing
<value xml:lang="en-US" install:module="unxwnt">.uno:OptionsTreeDialog</value>
</prop>
</node>
+ <node oor:name="F1_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:CommandPopup</value>
+ </prop>
+ </node>
</node>
<node oor:name="Modules">
<node oor:name="com.sun.star.script.BasicIDE" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 756bdd288b91..ad77ca0a19a5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6537,6 +6537,14 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:CommandPopup" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Command Popup</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:DevelopmentToolsDockingWindow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Development Tool</value>
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index b5126ca87893..941b11e59f94 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -291,6 +291,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/styles/StyleManager \
sfx2/source/toolbox/tbxitem \
sfx2/source/toolbox/weldutils \
+ sfx2/source/view/CommandPopup \
sfx2/source/view/classificationcontroller \
sfx2/source/view/classificationhelper \
sfx2/source/view/frame \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 7bdbd7a85a1e..ec80ab16de65 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/classificationbox \
sfx2/uiconfig/ui/cmisinfopage \
sfx2/uiconfig/ui/cmisline \
+ sfx2/uiconfig/ui/commandpopup \
sfx2/uiconfig/ui/custominfopage \
sfx2/uiconfig/ui/decktitlebar \
sfx2/uiconfig/ui/descriptioninfopage \
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 09aafef95b7d..a7c8a472e73d 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -262,6 +262,11 @@ interface TopWindow : BrowseWindow
ExecMethod = MiscExec_Impl ;
StateMethod = MiscState_Impl ;
]
+ SID_COMMAND_POPUP
+ [
+ ExecMethod = MiscExec_Impl ;
+ StateMethod = MiscState_Impl ;
+ ]
SID_CLOSEWIN // ole(no) api(final/play/rec)
[
ExecMethod = Exec_Impl ;
@@ -307,4 +312,3 @@ shell SfxViewFrame
StateMethod = GetState_Impl ;
]
}
-
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 425724440d13..85523a6f0b46 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1271,6 +1271,23 @@ SfxStringItem FullName SID_DOCFULLNAME
GroupId = ;
]
+SfxVoidItem CommandPopup SID_COMMAND_POPUP
+[
+ AutoUpdate = TRUE,
+ FastCall = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = SfxGroupId::View;
+]
SfxBoolItem FullScreen SID_WIN_FULLSCREEN
diff --git a/sfx2/source/view/CommandPopup.cxx b/sfx2/source/view/CommandPopup.cxx
new file mode 100644
index 000000000000..d44613280b65
--- /dev/null
+++ b/sfx2/source/view/CommandPopup.cxx
@@ -0,0 +1,308 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "CommandPopup.hxx"
+
+#include <vcl/layout.hxx>
+#include <workwin.hxx>
+#include <sfx2/msgpool.hxx>
+#include <sfx2/bindings.hxx>
+
+#include <comphelper/processfactory.hxx>
+#include <comphelper/dispatchcommand.hxx>
+
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XDispatchInformationProvider.hpp>
+#include <com/sun/star/frame/theUICommandDescription.hpp>
+#include <com/sun/star/ui/theUICategoryDescription.hpp>
+
+#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+
+#include <vcl/commandinfoprovider.hxx>
+
+using namespace css;
+
+struct CurrentEntry
+{
+ OUString m_aCommandURL;
+ OUString m_aTooltip;
+
+ CurrentEntry(OUString const& rCommandURL, OUString const& rTooltip)
+ : m_aCommandURL(rCommandURL)
+ , m_aTooltip(rTooltip)
+ {
+ }
+};
+
+struct MenuContent
+{
+ OUString m_aCommandURL;
+ OUString m_aMenuLabel;
+ OUString m_aFullLabelWithPath;
+ OUString m_aTooltip;
+ std::vector<MenuContent> m_aSubMenuContent;
+};
+
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XNotifyingDispatch.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/URLTransformer.hpp>
+
+class MenuContentHandler
+{
+private:
+ css::uno::Reference<css::frame::XFrame> m_xFrame;
+ MenuContent m_aMenuContent;
+ OUString m_sModuleLongName;
+
+public:
+ MenuContentHandler(uno::Reference<frame::XFrame> const& xFrame)
+ : m_xFrame(xFrame)
+ , m_sModuleLongName(vcl::CommandInfoProvider::GetModuleIdentifier(xFrame))
+ {
+ auto xComponentContext = comphelper::getProcessComponentContext();
+
+ uno::Reference<ui::XModuleUIConfigurationManagerSupplier> xModuleConfigSupplier;
+ xModuleConfigSupplier.set(
+ ui::theModuleUIConfigurationManagerSupplier::get(xComponentContext));
+
+ uno::Reference<ui::XUIConfigurationManager> xConfigurationManager;
+ xConfigurationManager = xModuleConfigSupplier->getUIConfigurationManager(m_sModuleLongName);
+
+ uno::Reference<container::XIndexAccess> xConfigData;
+ xConfigData = xConfigurationManager->getSettings("private:resource/menubar/menubar", false);
+
+ gatherMenuContent(xConfigData, m_aMenuContent);
+ }
+
+ void gatherMenuContent(uno::Reference<container::XIndexAccess> const& xIndexAccess,
+ MenuContent& rMenuContent)
+ {
+ for (sal_Int32 n = 0; n < xIndexAccess->getCount(); n++)
+ {
+ MenuContent aNewContent;
+ uno::Sequence<beans::PropertyValue> aProperties;
+ uno::Reference<container::XIndexAccess> xIndexContainer;
+
+ if (!(xIndexAccess->getByIndex(n) >>= aProperties))
+ continue;
+
+ bool bIsVisible = true;
+ bool bIsEnabled = true;
+
+ for (auto const& rProperty : aProperties)
+ {
+ OUString aPropertyName = rProperty.Name;
+ if (aPropertyName == "CommandURL")
+ rProperty.Value >>= aNewContent.m_aCommandURL;
+ else if (aPropertyName == "ItemDescriptorContainer")
+ rProperty.Value >>= xIndexContainer;
+ else if (aPropertyName == "IsVisible")
+ rProperty.Value >>= bIsVisible;
+ else if (aPropertyName == "Enabled")
+ rProperty.Value >>= bIsEnabled;
+ }
+
+ if (!bIsEnabled || !bIsVisible)
+ continue;
+
+ auto aCommandProperties = vcl::CommandInfoProvider::GetCommandProperties(
+ aNewContent.m_aCommandURL, m_sModuleLongName);
+ OUString aLabel = vcl::CommandInfoProvider::GetLabelForCommand(aCommandProperties);
+ aNewContent.m_aMenuLabel = aLabel;
+
+ if (!rMenuContent.m_aFullLabelWithPath.isEmpty())
+ aNewContent.m_aFullLabelWithPath = rMenuContent.m_aFullLabelWithPath + " / ";
+ aNewContent.m_aFullLabelWithPath += aNewContent.m_aMenuLabel;
+
+ aNewContent.m_aTooltip = vcl::CommandInfoProvider::GetTooltipForCommand(
+ aNewContent.m_aCommandURL, aCommandProperties, m_xFrame);
+
+ if (xIndexContainer.is())
+ gatherMenuContent(xIndexContainer, aNewContent);
+
+ rMenuContent.m_aSubMenuContent.push_back(aNewContent);
+ }
+ }
+
+ void findInMenu(OUString const& rText, std::unique_ptr<weld::TreeView>& rpCommandTreeView,
+ std::vector<CurrentEntry>& rCommandList)
+ {
+ findInMenuRecursive(m_aMenuContent, rText, rpCommandTreeView, rCommandList);
+ }
+
+private:
+ void findInMenuRecursive(MenuContent const& rMenuContent, OUString const& rText,
+ std::unique_ptr<weld::TreeView>& rpCommandTreeView,
+ std::vector<CurrentEntry>& rCommandList)
+ {
+ for (MenuContent const& aSubContent : rMenuContent.m_aSubMenuContent)
+ {
+ if (aSubContent.m_aMenuLabel.toAsciiLowerCase().startsWith(rText))
+ {
+ OUString sCommandURL = aSubContent.m_aCommandURL;
+ util::URL aCommandURL;
+ aCommandURL.Complete = sCommandURL;
+ uno::Reference<uno::XComponentContext> xContext
+ = comphelper::getProcessComponentContext();
+ uno::Reference<util::XURLTransformer> xParser
+ = util::URLTransformer::create(xContext);
+ xParser->parseStrict(aCommandURL);
+
+ auto* pViewFrame = SfxViewFrame::Current();
+
+ SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(pViewFrame);
+ const SfxSlot* pSlot = rSlotPool.GetUnoSlot(aCommandURL.Path);
+ if (pSlot)
+ {
+ std::unique_ptr<SfxPoolItem> pState;
+ SfxItemState eState
+ = pViewFrame->GetBindings().QueryState(pSlot->GetSlotId(), pState);
+
+ if (eState != SfxItemState::DISABLED)
+ {
+ auto xGraphic = vcl::CommandInfoProvider::GetXGraphicForCommand(sCommandURL,
+ m_xFrame);
+ rCommandList.emplace_back(sCommandURL, aSubContent.m_aTooltip);
+
+ auto pIter = rpCommandTreeView->make_iterator();
+ rpCommandTreeView->insert(nullptr, -1, &aSubContent.m_aFullLabelWithPath,
+ nullptr, nullptr, nullptr, false, pIter.get());
+ rpCommandTreeView->set_image(*pIter, xGraphic);
+ }
+ }
+ }
+ findInMenuRecursive(aSubContent, rText, rpCommandTreeView, rCommandList);
+ }
+ }
+};
+
+CommandListBox::CommandListBox(vcl::Window* pParent, CommandPopup& rPopUp,
+ uno::Reference<frame::XFrame> const& xFrame)
+ : InterimItemWindow(pParent, "sfx/ui/commandpopup.ui", "CommandBox")
+ , m_rPopUp(rPopUp)
+ , m_pEntry(m_xBuilder->weld_entry("command_entry"))
+ , m_pCommandTreeView(m_xBuilder->weld_tree_view("command_treeview"))
+ , m_pMenuContentHandler(std::make_unique<MenuContentHandler>(xFrame))
+{
+ m_pEntry->connect_changed(LINK(this, CommandListBox, ModifyHdl));
+ m_pEntry->connect_key_press(LINK(this, CommandListBox, TreeViewKeyPress));
+ m_pCommandTreeView->connect_query_tooltip(LINK(this, CommandListBox, QueryTooltip));
+ m_pCommandTreeView->connect_row_activated(LINK(this, CommandListBox, RowActivated));
+}
+
+void CommandListBox::initialize()
+{
+ Size aSize(400, 400);
+ SetSizePixel(aSize);
+ m_rPopUp.SetSizePixel(aSize);
+ Size aFrameSize = m_rPopUp.GetParent()->GetOutputSizePixel();
+ m_rPopUp.StartPopupMode(tools::Rectangle(Point(aFrameSize.Width(), 0), Size(0, 0)),
+ FloatWinPopupFlags::Down | FloatWinPopupFlags::GrabFocus);
+
+ Show();
+ GrabFocus();
+ m_pEntry->grab_focus();
+}
+
+void CommandListBox::dispose()
+{
+ m_pEntry.reset();
+ m_pCommandTreeView.reset();
+
+ InterimItemWindow::dispose();
+}
+
+IMPL_LINK_NOARG(CommandListBox, QueryTooltip, const weld::TreeIter&, OUString)
+{
+ size_t nSelected = m_pCommandTreeView->get_selected_index();
+ if (nSelected < m_aCommandList.size())
+ {
+ auto const& rCurrent = m_aCommandList[nSelected];
+ return rCurrent.m_aTooltip;
+ }
+ return OUString();
+}
+
+IMPL_LINK_NOARG(CommandListBox, RowActivated, weld::TreeView&, bool)
+{
+ OUString aCommandURL;
+ int nSelected = m_pCommandTreeView->get_selected_index();
+ if (nSelected < int(m_aCommandList.size()))
+ {
+ auto const& rCurrent = m_aCommandList[nSelected];
+ aCommandURL = rCurrent.m_aCommandURL;
+ }
+ dispatchCommandAndClose(aCommandURL);
+ return true;
+}
+
+IMPL_LINK(CommandListBox, TreeViewKeyPress, const KeyEvent&, rKeyEvent, bool)
+{
+ if (rKeyEvent.GetKeyCode().GetCode() == KEY_DOWN || rKeyEvent.GetKeyCode().GetCode() == KEY_UP)
+ {
+ int nDirection = rKeyEvent.GetKeyCode().GetCode() == KEY_DOWN ? 1 : -1;
+ int nNewIndex = m_pCommandTreeView->get_selected_index() + nDirection;
+ nNewIndex = std::clamp(nNewIndex, 0, m_pCommandTreeView->n_children());
+ m_pCommandTreeView->select(nNewIndex);
+ m_pCommandTreeView->set_cursor(nNewIndex);
+ return true;
+ }
+ else if (rKeyEvent.GetKeyCode().GetCode() == KEY_RETURN)
+ {
+ RowActivated(*m_pCommandTreeView);
+ }
+
+ return false;
+}
+
+IMPL_LINK_NOARG(CommandListBox, ModifyHdl, weld::Entry&, void)
+{
+ m_pCommandTreeView->clear();
+ m_aCommandList.clear();
+
+ OUString sText = m_pEntry->get_text();
+ if (sText.isEmpty())
+ return;
+
+ m_pCommandTreeView->freeze();
+ m_pMenuContentHandler->findInMenu(sText.toAsciiLowerCase(), m_pCommandTreeView, m_aCommandList);
+ m_pCommandTreeView->thaw();
+
+ if (m_pCommandTreeView->n_children() > 0)
+ {
+ m_pCommandTreeView->set_cursor(0);
+ m_pCommandTreeView->select(0);
+ }
+
+ m_pEntry->grab_focus();
+}
+
+void CommandListBox::dispatchCommandAndClose(OUString const& rCommand)
+{
+ m_rPopUp.EndPopupMode(FloatWinPopupEndFlags::CloseAll);
+ if (!rCommand.isEmpty())
+ comphelper::dispatchCommand(rCommand, uno::Sequence<beans::PropertyValue>());
+}
+
+CommandPopup::CommandPopup(vcl::Window* pParent)
+ : FloatingWindow(pParent, WB_BORDER | WB_SYSTEMWINDOW)
+{
+}
+
+CommandPopup::~CommandPopup() { disposeOnce(); }
+
+void CommandPopup::dispose() { FloatingWindow::dispose(); }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/CommandPopup.hxx b/sfx2/source/view/CommandPopup.hxx
new file mode 100644
index 000000000000..0659e608566a
--- /dev/null
+++ b/sfx2/source/view/CommandPopup.hxx
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <vcl/layout.hxx>
+
+#include <sfx2/dllapi.h>
+#include <sfx2/viewfrm.hxx>
+#include <vcl/floatwin.hxx>
+
+#include <com/sun/star/container/XNameAccess.hpp>
+
+#include <vcl/InterimItemWindow.hxx>
+#include <vcl/weld.hxx>
+#include <vcl/window.hxx>
+
+struct CurrentEntry;
+class MenuContentHandler;
+
+class SFX2_DLLPUBLIC CommandPopup : public FloatingWindow
+{
+public:
+ explicit CommandPopup(vcl::Window* pWorkWindow);
+
+ ~CommandPopup() override;
+
+ void dispose() override;
+};
+
+class SFX2_DLLPUBLIC CommandListBox final : public InterimItemWindow
+{
+private:
+ CommandPopup& m_rPopUp;
+
+ std::unique_ptr<weld::Entry> m_pEntry;
+ std::unique_ptr<weld::TreeView> m_pCommandTreeView;
+
+ std::vector<CurrentEntry> m_aCommandList;
+ OUString m_PreviousText;
+ std::unique_ptr<MenuContentHandler> m_pMenuContentHandler;
+
+ DECL_LINK(QueryTooltip, const weld::TreeIter&, OUString);
+ DECL_LINK(RowActivated, weld::TreeView&, bool);
+ DECL_LINK(ModifyHdl, weld::Entry&, void);
+ DECL_LINK(SelectionChanged, weld::TreeView&, void);
+ DECL_LINK(TreeViewKeyPress, const KeyEvent&, bool);
+
+ void dispatchCommandAndClose(OUString const& rCommand);
+
+public:
+ CommandListBox(vcl::Window* pParent, CommandPopup& rPopUp,
+ css::uno::Reference<css::frame::XFrame> const& xFrame);
+
+ void initialize();
+
+ void dispose() override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 170ce543da3b..d946525c4fd3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -25,6 +25,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/classificationhelper.hxx>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
+#include <svx/svdview.hxx>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/DispatchRecorder.hpp>
@@ -90,6 +91,7 @@
#include <unotools/configmgr.hxx>
#include <comphelper/sequenceashashmap.hxx>
+#include "CommandPopup.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -2913,8 +2915,26 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
rReq.Done();
break;
}
+ case SID_COMMAND_POPUP:
+ {
+ static VclPtr<CommandPopup> spCommandPopup;
+ static VclPtr<CommandListBox> spCommandListBox;
+
+ if (spCommandListBox)
+ spCommandListBox.disposeAndClear();
+
+ if (spCommandPopup)
+ spCommandPopup.disposeAndClear();
+
+ css::uno::Reference<css::frame::XFrame> xFrame(GetFrame().GetFrameInterface(), css::uno::UNO_QUERY);
+ spCommandPopup.reset(VclPtr<CommandPopup>::Create(&GetWindow()));
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ spCommandListBox.reset(VclPtr<CommandListBox>::Create(spCommandPopup.get(), *spCommandPopup.get(), xFrame));
+ spCommandListBox->initialize();
+
+ rReq.Done();
+ break;
+ }
case SID_WIN_FULLSCREEN:
{
const SfxBoolItem* pItem = rReq.GetArg<SfxBoolItem>(rReq.GetSlot());
diff --git a/sfx2/uiconfig/ui/commandpopup.ui b/sfx2/uiconfig/ui/commandpopup.ui
new file mode 100644
index 000000000000..713f1680a628
--- /dev/null
+++ b/sfx2/uiconfig/ui/commandpopup.ui
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
+<interface domain="sfx">
+ <requires lib="gtk+" version="3.18"/>
+ <object class="GtkTreeStore" id="liststore1">
+ <columns>
+ <!-- column-name icon -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name tooltip -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkBox" id="CommandBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border-width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="command_entry">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="caps-lock-warning">False</property>
+ <property name="placeholder-text" translatable="yes" context="commandpopup|entry">Search command</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="shadow-type">in</property>
+ <child>
+ <object class="GtkViewport">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <child>
+ <object class="GtkTreeView" id="command_treeview">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="model">liststore1</property>
+ <property name="headers-visible">False</property>
+ <property name="headers-clickable">False</property>
+ <property name="enable-search">False</property>
+ <property name="search-column">0</property>
+ <property name="hover-selection">True</property>
+ <property name="show-expanders">False</property>
+ <property name="tooltip-column">2</property>
+ <property name="activate-on-single-click">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="column">
+ <property name="sizing">fixed</property>
+ <child>
+ <object class="GtkCellRendererPixbuf" id="cellrenderericon"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
commit 7891969fde7f8abf44cdb73117690f6ebfff41c0
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Nov 12 10:01:20 2020 +0100
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sun Mar 7 13:51:04 2021 +0900
basegfx: added LengthUnit class as the base unit for length
Change-Id: I1d4790b60dd784e8b2e2e438274f3ebd6db4b60c
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index a0379e76612a..b66b1381d69a 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\
basegfx/test/basegfxtools \
basegfx/test/clipstate \
basegfx/test/genericclipper \
+ basegfx/test/LengthUnitTest \
))
# vim: set noet sw=4 ts=4:
diff --git a/basegfx/test/LengthUnitTest.cxx b/basegfx/test/LengthUnitTest.cxx
new file mode 100644
index 000000000000..0b80c33da5b0
--- /dev/null
+++ b/basegfx/test/LengthUnitTest.cxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <basegfx/units/LengthUnit.hxx>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+class LengthUnitTest : public CppUnit::TestFixture
+{
+public:
+ void test();
+
+ CPPUNIT_TEST_SUITE(LengthUnitTest);
+ CPPUNIT_TEST(test);
+ CPPUNIT_TEST_SUITE_END();
+};
+
+void LengthUnitTest::test()
+{
+ gfx::LengthUnit cm = 1_cm + 5_cm - 2_cm;
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(4.0, cm.as_cm(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(0.04, cm.as_m(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(40.0, cm.as_mm(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(1440000), cm.raw());
+
+ gfx::LengthUnit cm2 = 5_cm * 2;
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(3600000), cm2.raw());
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, cm2.as_cm(), 1e-4);
+
+ // 1 km - 50 m = 950 m = 95000 cm
+ gfx::LengthUnit cm3 = 100000_cm - 5000_cm;
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(34200000000), cm3.raw());
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(95000.0, cm3.as_cm(), 1e-4);
+
+ gfx::LengthUnit cm4(1_cm);
+ cm4 /= 2;
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(180000), cm4.raw());
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5, cm4.as_cm(), 1e-4);
+
+ // (635 * 20) + 3 * (635 * 15) = 41275EMU
+ gfx::LengthUnit pt = 1_pt + 3_px;
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(3.25, pt.as_pt(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(65.0, pt.as_twip(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0451, pt.as_in(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(41275), pt.raw());
+
+ gfx::LengthUnit inch = 1_in; // 1440 * 635
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1440.0, inch.as_twip(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(96.0, inch.as_px(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, inch.as_in(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(914400.0, inch.as_emu(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(914400), inch.raw());
+
+ // Conversion
+ sal_Int64 asNumber(17_pt);
+ asNumber += sal_Int64(1_pt);
+ gfx::LengthUnit asLength = gfx::LengthUnit::emu(asNumber);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(18 * 635 * 20), asLength.raw());
+
+ gfx::LengthUnit maximum = gfx::LengthUnit::emu(SAL_MAX_INT64);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(256204778801.5, maximum.as_m(), 1e-1);
+ // 256204778 km
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(SAL_MAX_INT64), maximum.raw());
+
+ gfx::LengthUnit minimum = gfx::LengthUnit::emu(SAL_MIN_INT64);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(-256204778801.5, minimum.as_m(), 1e-1);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(double(SAL_MIN_INT64), minimum.as_emu(), 1e-1);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(SAL_MIN_INT64), minimum.raw());
+
+ // 27 emu + 33 emu + 360 emu = 420
+ gfx::LengthUnit emus = 27_emu + 33_emu + 1_hmm;
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(420), emus.raw());
+
+ // Creation from number
+ int number = 10;
+ auto asCm = gfx::LengthUnit::cm(number);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, asCm.as_cm(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(3600000), asCm.raw());
+
+ auto asMm = gfx::LengthUnit::mm(number);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, asMm.as_mm(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(360000), asMm.raw());
+
+ auto asInch = gfx::LengthUnit::in(number);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, asInch.as_in(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(9144000), asInch.raw());
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(LengthUnitTest);
diff --git a/include/basegfx/units/LengthUnit.hxx b/include/basegfx/units/LengthUnit.hxx
new file mode 100644
index 000000000000..4edd1cc4704f
--- /dev/null
+++ b/include/basegfx/units/LengthUnit.hxx
@@ -0,0 +1,194 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <sal/types.h>
+
+namespace gfx
+{
+namespace
+{
+constexpr sal_Int64 constFactor_hmm_to_EMU = 360ll;
+constexpr sal_Int64 constFactor_mm_to_EMU = constFactor_hmm_to_EMU * 100ll;
+constexpr sal_Int64 constFactor_cm_to_EMU = constFactor_hmm_to_EMU * 1000ll;
+constexpr sal_Int64 constFactor_m_to_EMU = constFactor_hmm_to_EMU * 100000ll;
+
+constexpr sal_Int64 constFactor_twip_to_EMU = 635ll;
+constexpr sal_Int64 constFactor_in_to_EMU = constFactor_twip_to_EMU * 1440ll;
+constexpr sal_Int64 constFactor_pt_to_EMU = constFactor_twip_to_EMU * 20ll;
+constexpr sal_Int64 constFactor_px_to_EMU = constFactor_twip_to_EMU * 15ll;
+
+} // end anonymous namespace
+
+template <typename T> class LengthUnitBase
+{
+private:
+ // value in EMU units
+ T m_nValue;
+
+ constexpr explicit LengthUnitBase(T nValue)
+ : m_nValue(nValue)
+ {
+ }
+
+public:
+ static constexpr LengthUnitBase cm(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_cm_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase mm(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_mm_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase hmm(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_hmm_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase in(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_in_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase twip(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_twip_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase pt(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_pt_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase px(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_px_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase emu(T nValue) { return LengthUnitBase(nValue); }
+
+ constexpr explicit LengthUnitBase()
+ : m_nValue(0)
+ {
+ }
+
+ constexpr explicit operator T() const { return m_nValue; }
+
+ constexpr LengthUnitBase& operator+=(LengthUnitBase const& rhs)
+ {
+ m_nValue += rhs.m_nValue;
+ return *this;
+ }
+
+ constexpr LengthUnitBase& operator-=(LengthUnitBase const& rhs)
+ {
+ m_nValue -= rhs.m_nValue;
+ return *this;
+ }
+
+ constexpr LengthUnitBase& operator*=(T const& rhs)
+ {
+ m_nValue *= rhs;
+ return *this;
+ }
+
+ constexpr LengthUnitBase& operator/=(T const& rhs)
+ {
+ m_nValue /= rhs;
+ return *this;
+ }
+
+ constexpr LengthUnitBase& operator-()
+ {
+ m_nValue = -m_nValue;
+ return *this;
+ }
+
+ T raw() const { return m_nValue; }
+
+ double as_hmm() const { return m_nValue / double(constFactor_hmm_to_EMU); }
+ double as_mm() const { return m_nValue / double(constFactor_mm_to_EMU); }
+ double as_cm() const { return m_nValue / double(constFactor_cm_to_EMU); }
+ double as_m() const { return m_nValue / double(constFactor_m_to_EMU); }
+ double as_twip() const { return m_nValue / double(constFactor_twip_to_EMU); }
+ double as_in() const { return m_nValue / double(constFactor_in_to_EMU); }
+ double as_pt() const { return m_nValue / double(constFactor_pt_to_EMU); }
+ double as_px() const { return m_nValue / double(constFactor_px_to_EMU); }
+ double as_emu() const { return double(m_nValue); }
+};
+
+template <typename T>
+inline LengthUnitBase<T> operator+(LengthUnitBase<T> lhs, const LengthUnitBase<T>& rhs)
+{
+ return lhs += rhs;
+}
+
+template <typename T>
+inline LengthUnitBase<T> operator-(LengthUnitBase<T> lhs, const LengthUnitBase<T>& rhs)
+{
+ return lhs -= rhs;
+}
+
+template <typename T> inline LengthUnitBase<T> operator*(LengthUnitBase<T> lhs, const long rhs)
+{
+ return lhs *= rhs;
+}
+
+template <typename T> inline LengthUnitBase<T> operator/(LengthUnitBase<T> lhs, const long rhs)
+{
+ return lhs /= rhs;
+}
+
+typedef LengthUnitBase<sal_Int64> LengthUnit;
+typedef LengthUnitBase<double> LengthUnitD;
+
+} // end namespace gfx
+
+constexpr gfx::LengthUnit operator"" _emu(unsigned long long value)
+{
+ return gfx::LengthUnit::emu(value);
+}
+
+constexpr gfx::LengthUnit operator"" _in(unsigned long long value)
+{
+ return gfx::LengthUnit::in(value);
+}
+
+constexpr gfx::LengthUnit operator"" _cm(unsigned long long value)
+{
+ return gfx::LengthUnit::cm(value);
+}
+
+constexpr gfx::LengthUnit operator"" _mm(unsigned long long value)
+{
+ return gfx::LengthUnit::mm(value);
+}
+
+constexpr gfx::LengthUnit operator"" _hmm(unsigned long long value)
+{
+ return gfx::LengthUnit::hmm(value);
+}
+
+constexpr gfx::LengthUnit operator"" _twip(unsigned long long value)
+{
+ return gfx::LengthUnit::twip(value);
+}
+
+constexpr gfx::LengthUnit operator"" _pt(unsigned long long value)
+{
+ return gfx::LengthUnit::pt(value);
+}
+
+constexpr gfx::LengthUnit operator"" _px(unsigned long long value)
+{
+ return gfx::LengthUnit::px(value);
+}
commit 1d0e24c88683791d5e4ac557b2cd7408941269c0
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Aug 29 15:42:42 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sun Mar 7 13:51:04 2021 +0900
Add button 'Render Features' to Options
Change-Id: I1a0aa538cdb6d32aa1d0377fd3d032c80bb742a5
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f15171e38103..431d3a21ff3c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -582,6 +582,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, weld::DialogController* p
, m_xMousePosLB(m_xBuilder->weld_combo_box("mousepos"))
, m_xMouseMiddleLB(m_xBuilder->weld_combo_box("mousemiddle"))
, m_xMoreIcons(m_xBuilder->weld_button("btnMoreIcons"))
+ , m_xButtonTestRenderFeatures(m_xBuilder->weld_button("button_test_render_features"))
{
if (Application::GetToolkitName() == "gtk3")
m_xMenuIconBox->hide();
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 07d3cca86fb7..a81bfce2a78c 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -115,6 +115,8 @@ private:
std::unique_ptr<weld::ComboBox> m_xMouseMiddleLB;
std::unique_ptr<weld::Button> m_xMoreIcons;
+ std::unique_ptr<weld::Button> m_xButtonTestRenderFeatures;
+
DECL_LINK(OnAntialiasingToggled, weld::ToggleButton&, void);
DECL_LINK(OnUseSkiaToggled, weld::ToggleButton&, void);
DECL_STATIC_LINK(OfaViewTabPage, OnMoreIconsClick, weld::Button&, void);
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index e7dd3e237fb9..03d4e50f941a 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -481,6 +481,18 @@
<property name="top-attach">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="button_test_render_features">
+ <property name="label" translatable="yes" context="optviewpage|button_test_render_features">Test Render Features</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left-attach">0</property>
commit 1ef6494014d18bc9382c67f289c8c937c90f3828
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Aug 29 15:22:03 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sun Mar 7 13:51:04 2021 +0900
Benchmark
Change-Id: I22e0ac54380e2d22606e7b1fd453bed843523a29
diff --git a/Repository.mk b/Repository.mk
index 930ae5bfdc94..1b3bf551ff70 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
tiledrendering \
mtfdemo \
visualbackendtest \
+ benchmark \
$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
))
diff --git a/vcl/Executable_benchmark.mk b/vcl/Executable_benchmark.mk
new file mode 100644
index 000000000000..c72039c13f7b
--- /dev/null
+++ b/vcl/Executable_benchmark.mk
@@ -0,0 +1,56 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,benchmark))
+
+$(eval $(call gb_Executable_use_api,benchmark,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Executable_use_external,benchmark,boost_headers))
+
+$(eval $(call gb_Executable_set_include,benchmark,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,benchmark,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ tl \
+ sal \
+ salhelper \
+ vcl \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,benchmark,\
+ vcl/backendtest/Benchmark \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,benchmark,\
+ vclmain \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_libs,benchmark,\
+ -lm \
+ -ldl \
+ -lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,benchmark,\
+ glxtest \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 3a3626157b1f..1a82eaabb8be 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(DISABLE_GUI),, \
Executable_vcldemo \
Executable_icontest \
+ Executable_benchmark \
Executable_visualbackendtest \
Executable_mtfdemo ))) \
))
diff --git a/vcl/backendtest/Benchmark.cxx b/vcl/backendtest/Benchmark.cxx
new file mode 100644
index 000000000000..8a57feba2657
--- /dev/null
+++ b/vcl/backendtest/Benchmark.cxx
@@ -0,0 +1,301 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/bootstrap.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/registry/XSimpleRegistry.hpp>
+#include <com/sun/star/ucb/UniversalContentBroker.hpp>
+
+#include <vcl/virdev.hxx>
+#include <vcl/vclmain.hxx>
+#include <bitmap/BitmapWriteAccess.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/svapp.hxx>
+
+#include <chrono>
+#include <iostream>
+#include <tools/ScopedNanoTimer.hxx>
+
+using namespace css;
+
+class Benchmark
+{
+ ScopedVclPtr<VirtualDevice> mpVDev;
+ int mnRepeats;
+
+ Size maSource;
+ Size maTarget;
+
+public:
+ Benchmark()
+ : mpVDev(VclPtr<VirtualDevice>::Create())
+ , mnRepeats(2)
+ {
+ mpVDev->SetAntialiasing(AntialiasingFlags::Enable | AntialiasingFlags::PixelSnapHairline);
+ mpVDev->SetOutputSizePixel(Size(4000, 4000));
+ mpVDev->SetBackground(Wallpaper(COL_LIGHTGRAY));
+ }
+
+ void run()
+ {
+ std::vector<sal_Int64> aCompleteTimes(20, 0);
+
+ mnRepeats = 5;
+ for (long iSize : { 4000, 2000, 1000 })
+ {
+ std::vector<std::pair<OUString, sal_Int64>> aTotalTimes(20);
+
+ maSource = Size(iSize, iSize);
+ maTarget = Size(200, 200);
+
+ for (int i = 0; i < mnRepeats; i++)
+ {
+ size_t a = 0;
+ //benchBitmapScale2(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ //benchBitmapScale4(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ //benchBitmapScale8X(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ //benchBitmapScale8(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ benchBitmapScale24(aTotalTimes[a].first, aTotalTimes[a].second);
+ a++;
+ benchBitmapScale24Combo(aTotalTimes[a].first, aTotalTimes[a].second);
+ a++;
+ benchBitmapScale32(aTotalTimes[a].first, aTotalTimes[a].second);
+ a++;
+ benchBitmapScale32Combo(aTotalTimes[a].first, aTotalTimes[a].second);
+ a++;
+
+ /*benchBitmap2(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ benchBitmap4(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ benchBitmap8X(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ benchBitmap8(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ benchBitmap24(aTotalTimes[a].first, aTotalTimes[a].second); a++;
+ benchBitmap32(aTotalTimes[a].first, aTotalTimes[a].second); a++;*/
+ }
+
+ int i = 0;
+ for (auto& rPair : aTotalTimes)
+ {
+ if (!rPair.first.isEmpty())
+ {
+ aCompleteTimes[i] += rPair.second / double(mnRepeats);
+ printf("TIME %d: %s - %f\n", i, rPair.first.toUtf8().getStr(),
+ rPair.second / double(mnRepeats));
+ }
+ i++;
+ }
+ printf("\n");
+ }
+ int i = 0;
+ for (auto& rTime : aCompleteTimes)
+ {
+ if (rTime > 0)
+ {
+ printf("TIME %d: %f\n", i, double(rTime));
+ i++;
+ }
+ }
+ }
+
+ void benchBitmapScale2(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "2 Scale";
+ Bitmap aBitmap(maSource, 2, &Bitmap::GetGreyPalette(2));
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ aBitmap.Scale(maTarget, BmpScaleFlag::Super);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmapScale4(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "4 Scale";
+ Bitmap aBitmap(maSource, 4, &Bitmap::GetGreyPalette(16));
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ aBitmap.Scale(maTarget, BmpScaleFlag::Super);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmapScale8X(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "8X Scale";
+ Bitmap aBitmap(maSource, 8);
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ aBitmap.Scale(maTarget, BmpScaleFlag::Super);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmapScale8(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "8 Scale";
+ Bitmap aBitmap(maSource, 8, &Bitmap::GetGreyPalette(256));
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ aBitmap.Scale(maTarget, BmpScaleFlag::Super);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmapScale24(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "24 Scale Super";
+ Bitmap aBitmap(maSource, 24);
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ aBitmap.Scale(maTarget, BmpScaleFlag::Super);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmapScale24Combo(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "24 Scale Combo";
+ Bitmap aBitmap(maSource, 24);
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ aBitmap.Scale(maTarget, BmpScaleFlag::Combo);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmapScale32(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "32 Scale Super";
+ Bitmap aBitmap(maSource, 32);
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ aBitmap.Scale(maTarget, BmpScaleFlag::Super);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmapScale32Combo(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "32 Scale Combo";
+ Bitmap aBitmap(maSource, 32);
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ aBitmap.Scale(maTarget, BmpScaleFlag::Combo);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmap2(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "2";
+ mpVDev->Erase();
+
+ Bitmap aBitmap(Size(4000, 4000), 2, &Bitmap::GetGreyPalette(2));
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ mpVDev->DrawBitmap(Point(), aBitmap);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmap4(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "4";
+ mpVDev->Erase();
+
+ Bitmap aBitmap(Size(4000, 4000), 4, &Bitmap::GetGreyPalette(16));
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ mpVDev->DrawBitmap(Point(), aBitmap);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmap8X(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "8X";
+ mpVDev->Erase();
+ Bitmap aBitmap(Size(4000, 4000), 8);
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ mpVDev->DrawBitmap(Point(), aBitmap);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmap8(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "8";
+ mpVDev->Erase();
+ Bitmap aBitmap(Size(4000, 4000), 8, &Bitmap::GetGreyPalette(256));
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ mpVDev->DrawBitmap(Point(), aBitmap);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmap24(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "24";
+ mpVDev->Erase();
+ Bitmap aBitmap(Size(4000, 4000), 24);
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer(rName.toUtf8(), 1000);
+ mpVDev->DrawBitmap(Point(), aBitmap);
+ rTotal += aTimer.stop();
+ }
+
+ void benchBitmap32(OUString& rName, sal_Int64& rTotal)
+ {
+ rName = "32";
+ mpVDev->Erase();
+ Bitmap aBitmap(Size(4000, 4000), 32);
+ aBitmap.Erase(COL_YELLOW);
+ ScopedNanoTimer aTimer("32", 1000);
+ mpVDev->DrawBitmap(Point(), aBitmap);
+ rTotal += aTimer.stop();
+ }
+};
+
+class BenchmarkApp : public Application
+{
+public:
+ BenchmarkApp() {}
+
+ virtual int Main() override
+ {
+ Benchmark aBenchmark;
+ aBenchmark.run();
+ return 0;
+ }
+
+protected:
+ void Init() override
+ {
+ try
+ {
+ uno::Reference<uno::XComponentContext> xComponentContext
+ = ::cppu::defaultBootstrap_InitialComponentContext();
+ uno::Reference<lang::XMultiServiceFactory> xMSF
+ = uno::Reference<lang::XMultiServiceFactory>(xComponentContext->getServiceManager(),
+ uno::UNO_QUERY);
+
+ if (!xMSF.is())
+ Application::Abort("Bootstrap failure - no service manager");
+
+ comphelper::setProcessServiceFactory(xMSF);
+ }
+ catch (const uno::Exception& e)
+ {
+ Application::Abort("Bootstrap exception " + e.Message);
+ }
+ }
+
+ void DeInit() override
+ {
+ uno::Reference<lang::XComponent> xComponent(comphelper::getProcessComponentContext(),
+ uno::UNO_QUERY_THROW);
+ xComponent->dispose();
+ comphelper::setProcessServiceFactory(nullptr);
+ }
+};
+
+void vclmain::createApplication() { static BenchmarkApp aApplication; }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e22ccdce16a52eff7fcf738a6cef1dfc940fca3e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Aug 29 11:58:53 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sun Mar 7 13:50:33 2021 +0900
Update BitmapSymmetryCheck check
Change-Id: I5b0080ebc76f7c1cd118cf5317b06ffe1a1c20df
diff --git a/vcl/inc/BitmapSymmetryCheck.hxx b/vcl/inc/BitmapSymmetryCheck.hxx
index 3e79a426b94c..48c73551d887 100644
--- a/vcl/inc/BitmapSymmetryCheck.hxx
+++ b/vcl/inc/BitmapSymmetryCheck.hxx
@@ -12,19 +12,24 @@
#define INCLUDED_VCL_INC_BITMAPSYMMETRYCHECK_HXX
#include <vcl/bitmap.hxx>
+#include <vcl/bitmapex.hxx>
class BitmapReadAccess;
class VCL_DLLPUBLIC BitmapSymmetryCheck final
{
-public:
- BitmapSymmetryCheck();
- ~BitmapSymmetryCheck();
+private:
+ std::vector<std::pair<Point, Point>> maNonSymmetricPoints;
+ Size maSize;
- static bool check(Bitmap& rBitmap);
+public:
+ BitmapSymmetryCheck() = default;
+ bool check(Bitmap& rBitmap);
+ BitmapEx getErrorBitmap();
private:
- static bool checkImpl(BitmapReadAccess const* pReadAccess);
+ bool checkImpl(BitmapReadAccess const* pReadAccess);
+ void addNewError(Point const& rPoint1, Point const& rPoint2);
};
#endif // INCLUDED_VCL_INC_BITMAPSYMMETRYCHECK_HXX
diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx b/vcl/qa/cppunit/BitmapFilterTest.cxx
index 09831169e656..80fc6bd95a76 100644
--- a/vcl/qa/cppunit/BitmapFilterTest.cxx
+++ b/vcl/qa/cppunit/BitmapFilterTest.cxx
@@ -127,7 +127,9 @@ void BitmapFilterTest::testBlurCorrectness()
CPPUNIT_ASSERT_EQUAL(nBPP, aBitmap24Bit.GetBitCount());
// Check that the bitmap is horizontally and vertically symmetrical
- CPPUNIT_ASSERT(BitmapSymmetryCheck::check(aBitmap24Bit));
+ BitmapSymmetryCheck aBitmapSymmetryCheck;
+ bool bSymmetryCheckResult = aBitmapSymmetryCheck.check(aBitmap24Bit);
+ CPPUNIT_ASSERT(bSymmetryCheckResult);
{
Bitmap::ScopedReadAccess aReadAccess(aBitmap24Bit);
diff --git a/vcl/qa/cppunit/BitmapScaleTest.cxx b/vcl/qa/cppunit/BitmapScaleTest.cxx
index 09ec8f9a3728..958ac893d48a 100644
--- a/vcl/qa/cppunit/BitmapScaleTest.cxx
+++ b/vcl/qa/cppunit/BitmapScaleTest.cxx
@@ -18,19 +18,82 @@
#include <BitmapSymmetryCheck.hxx>
#include <bitmap/BitmapWriteAccess.hxx>
+#include <vcl/BitmapTools.hxx>
+
+#include <svdata.hxx>
+#include <salinst.hxx>
namespace
{
class BitmapScaleTest : public CppUnit::TestFixture
{
+ static constexpr const bool mbExportBitmap = true;
+
+ void exportImage(OUString const& rsFilename, Bitmap const& rBitmap)
+ {
+ if (mbExportBitmap)
+ {
+ SvFileStream aStream(rsFilename, StreamMode::WRITE | StreamMode::TRUNC);
+ GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+ if (rBitmap.GetBitCount() == 32)
+ {
+ BitmapEx aBitmapConverted;
+ vcl::bitmap::convertBitmap32To24Plus8(BitmapEx(rBitmap), aBitmapConverted);
+ rFilter.compressAsPNG(aBitmapConverted, aStream);
+ }
+ else
+ {
+ rFilter.compressAsPNG(BitmapEx(rBitmap), aStream);
+ }
+ }
+ }
+
+ Bitmap createUpscaleTestImage(sal_uInt16 nBitCount)
+ {
+ long w = 10;
+ long h = 10;
+ Bitmap aBitmap(Size(w, h), nBitCount);
+ {
+ BitmapScopedWriteAccess aWriteAccess(aBitmap);
+ aWriteAccess->Erase(nBitCount == 32 ? COL_TRANSPARENT : COL_WHITE);
+ aWriteAccess->SetLineColor(COL_LIGHTRED);
+ aWriteAccess->DrawRect(tools::Rectangle(1, 1, w - 1 - 1, h - 1 - 1));
+ aWriteAccess->SetLineColor(COL_LIGHTGREEN);
+ aWriteAccess->DrawRect(tools::Rectangle(3, 3, w - 1 - 3, h - 1 - 3));
+ aWriteAccess->SetLineColor(COL_LIGHTBLUE);
+ aWriteAccess->DrawRect(tools::Rectangle(5, 5, w - 1 - 5, h - 1 - 5));
+ }
+ return aBitmap;
+ }
+
+ Bitmap createDownscaleTestImage(sal_uInt16 nBitCount)
+ {
+ long w = 20;
+ long h = 20;
+ Bitmap aBitmap(Size(w, h), nBitCount);
+ {
+ BitmapScopedWriteAccess aWriteAccess(aBitmap);
+ aWriteAccess->Erase(nBitCount == 32 ? COL_TRANSPARENT : COL_WHITE);
+ aWriteAccess->SetLineColor(COL_LIGHTRED);
+ aWriteAccess->DrawRect(tools::Rectangle(2, 2, w - 1 - 2, h - 1 - 2));
+ aWriteAccess->SetLineColor(COL_LIGHTGREEN);
+ aWriteAccess->DrawRect(tools::Rectangle(5, 5, w - 1 - 5, h - 1 - 5));
+ aWriteAccess->SetLineColor(COL_LIGHTBLUE);
+ aWriteAccess->DrawRect(tools::Rectangle(8, 8, w - 1 - 8, h - 1 - 8));
+ }
+ return aBitmap;
+ }
+
void testScale();
void testScale2();
- void testScaleSymmetry();
+ void testScaleSymmetryUp24();
+ void testScaleSymmetryDown24();
CPPUNIT_TEST_SUITE(BitmapScaleTest);
CPPUNIT_TEST(testScale);
CPPUNIT_TEST(testScale2);
- CPPUNIT_TEST(testScaleSymmetry);
+ CPPUNIT_TEST(testScaleSymmetryUp24);
+ CPPUNIT_TEST(testScaleSymmetryDown24);
CPPUNIT_TEST_SUITE_END();
};
@@ -269,51 +332,63 @@ void BitmapScaleTest::testScale2()
CPPUNIT_ASSERT(checkBitmapColor(aScaledBitmap, aBitmapColor));
}
-void BitmapScaleTest::testScaleSymmetry()
+void BitmapScaleTest::testScaleSymmetryUp24()
{
- const bool bExportBitmap(false);
+ Bitmap aBitmap = createUpscaleTestImage(24);
+ CPPUNIT_ASSERT_EQUAL(sal_uInt16(24), aBitmap.GetBitCount());
+ exportImage("~/scale_up_24_before.png", aBitmap);
- Bitmap aBitmap24Bit(Size(10, 10), 24);
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(24), aBitmap24Bit.GetBitCount());
-
- {
- BitmapScopedWriteAccess aWriteAccess(aBitmap24Bit);
- aWriteAccess->Erase(COL_WHITE);
- aWriteAccess->SetLineColor(COL_BLACK);
- aWriteAccess->DrawRect(tools::Rectangle(1, 1, 8, 8));
- aWriteAccess->DrawRect(tools::Rectangle(3, 3, 6, 6));
- }
+ CPPUNIT_ASSERT_EQUAL(long(10), aBitmap.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(long(10), aBitmap.GetSizePixel().Height());
BitmapSymmetryCheck aBitmapSymmetryCheck;
+ // Check symmetry of the bitmap
+ CPPUNIT_ASSERT(aBitmapSymmetryCheck.check(aBitmap));
+
+ aBitmap.Scale(2, 2);
+
+ CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(20), aBitmap.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(20), aBitmap.GetSizePixel().Height());
+
+ exportImage("~/scale_up_24_after.png", aBitmap);
+
+ // After scaling the bitmap should still be symmetrical. This check guarantees that
+ // scaling doesn't misalign the bitmap.
+ bool bSymmetryCheckResult = aBitmapSymmetryCheck.check(aBitmap);
+ if (!bSymmetryCheckResult)
+ exportImage("~/scale_up_24_after_error.png",
+ aBitmapSymmetryCheck.getErrorBitmap().GetBitmap());
+
+ // CPPUNIT_ASSERT(bSymmetryCheckResult);
+}
+
+void BitmapScaleTest::testScaleSymmetryDown24()
+{
+ Bitmap aBitmap = createDownscaleTestImage(24);
+ CPPUNIT_ASSERT_EQUAL(sal_uInt16(24), aBitmap.GetBitCount());
+ exportImage("~/scale_down_24_before.png", aBitmap);
- CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(10), aBitmap24Bit.GetSizePixel().Width());
- CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(10), aBitmap24Bit.GetSizePixel().Height());
+ CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(20), aBitmap.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(20), aBitmap.GetSizePixel().Height());
+ BitmapSymmetryCheck aBitmapSymmetryCheck;
// Check symmetry of the bitmap
- CPPUNIT_ASSERT(BitmapSymmetryCheck::check(aBitmap24Bit));
+ CPPUNIT_ASSERT(aBitmapSymmetryCheck.check(aBitmap));
- if (bExportBitmap)
- {
- SvFileStream aStream("~/scale_before.png", StreamMode::WRITE | StreamMode::TRUNC);
- GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
- rFilter.compressAsPNG(BitmapEx(aBitmap24Bit), aStream);
- }
+ aBitmap.Scale(0.5, 0.5);
- aBitmap24Bit.Scale(2, 2, BmpScaleFlag::Fast);
+ exportImage("~/scale_down_24_after.png", aBitmap);
- CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(20), aBitmap24Bit.GetSizePixel().Width());
- CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(20), aBitmap24Bit.GetSizePixel().Height());
+ CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(10), aBitmap.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(10), aBitmap.GetSizePixel().Height());
// After scaling the bitmap should still be symmetrical. This check guarantees that
// scaling doesn't misalign the bitmap.
- CPPUNIT_ASSERT(BitmapSymmetryCheck::check(aBitmap24Bit));
-
- if (bExportBitmap)
- {
- SvFileStream aStream("~/scale_after.png", StreamMode::WRITE | StreamMode::TRUNC);
- GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
- rFilter.compressAsPNG(BitmapEx(aBitmap24Bit), aStream);
- }
+ bool bSymmetryCheckResult = aBitmapSymmetryCheck.check(aBitmap);
+ if (!bSymmetryCheckResult)
+ exportImage("~/scale_down_24_after_error.png",
+ aBitmapSymmetryCheck.getErrorBitmap().GetBitmap());
+ // CPPUNIT_ASSERT(aBitmapSymmetryCheck.check(aBitmap));
}
} // namespace
diff --git a/vcl/source/bitmap/BitmapSymmetryCheck.cxx b/vcl/source/bitmap/BitmapSymmetryCheck.cxx
index d2e450c0337d..b4673d5dcad6 100644
--- a/vcl/source/bitmap/BitmapSymmetryCheck.cxx
+++ b/vcl/source/bitmap/BitmapSymmetryCheck.cxx
@@ -8,16 +8,11 @@
*
*/
+#include <bitmap/BitmapWriteAccess.hxx>
#include <vcl/BitmapReadAccess.hxx>
#include <BitmapSymmetryCheck.hxx>
-BitmapSymmetryCheck::BitmapSymmetryCheck()
-{}
-
-BitmapSymmetryCheck::~BitmapSymmetryCheck()
-{}
-
bool BitmapSymmetryCheck::check(Bitmap& rBitmap)
{
Bitmap::ScopedReadAccess aReadAccess(rBitmap);
@@ -26,9 +21,13 @@ bool BitmapSymmetryCheck::check(Bitmap& rBitmap)
bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess const * pReadAccess)
{
+ maNonSymmetricPoints.clear();
+
tools::Long nHeight = pReadAccess->Height();
tools::Long nWidth = pReadAccess->Width();
+ maSize = Size(nWidth, nHeight);
+
tools::Long nHeightHalf = nHeight / 2;
tools::Long nWidthHalf = nWidth / 2;
@@ -37,22 +36,21 @@ bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess const * pReadAccess)
for (tools::Long y = 0; y < nHeightHalf; ++y)
{
- Scanline pScanlineRead = pReadAccess->GetScanline( y );
- Scanline pScanlineRead2 = pReadAccess->GetScanline( nHeight - y - 1 );
+
+ tools::Long y2 = nHeight - y - 1;
+
+ Scanline pScanlineRead1 = pReadAccess->GetScanline(y);
+ Scanline pScanlineRead2 = pReadAccess->GetScanline(y2);
for (tools::Long x = 0; x < nWidthHalf; ++x)
{
- if (pReadAccess->GetPixelFromData(pScanlineRead, x) != pReadAccess->GetPixelFromData(pScanlineRead2, x))
- {
- return false;
- }
- if (pReadAccess->GetPixelFromData(pScanlineRead, x) != pReadAccess->GetPixelFromData(pScanlineRead, nWidth - x - 1))
- {
- return false;
- }
- if (pReadAccess->GetPixelFromData(pScanlineRead, x) != pReadAccess->GetPixelFromData(pScanlineRead2, nWidth - x - 1))
- {
- return false;
- }
+ tools::Long x2 = nWidth - x - 1;
+
+ if (pReadAccess->GetPixelFromData(pScanlineRead1, x) != pReadAccess->GetPixelFromData(pScanlineRead2, x))
+ addNewError(Point(x, y), Point(x, y2));
+ if (pReadAccess->GetPixelFromData(pScanlineRead1, x) != pReadAccess->GetPixelFromData(pScanlineRead1, x2))
+ addNewError(Point(x, y), Point(x2, y));
+ if (pReadAccess->GetPixelFromData(pScanlineRead1, x) != pReadAccess->GetPixelFromData(pScanlineRead2, x2))
+ addNewError(Point(x, y), Point(x2, y2));
}
}
@@ -60,10 +58,9 @@ bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess const * pReadAccess)
{
for (tools::Long y = 0; y < nHeightHalf; ++y)
{
- if (pReadAccess->GetPixel(y, nWidthHalf) != pReadAccess->GetPixel(nHeight - y - 1, nWidthHalf))
- {
- return false;
- }
+ tools::Long y2 = nHeight - y - 1;
+ if (pReadAccess->GetPixel(y, nWidthHalf) != pReadAccess->GetPixel(y2, nWidthHalf))
+ addNewError(Point(nWidthHalf, y), Point(nWidthHalf, y2));
}
}
@@ -72,14 +69,38 @@ bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess const * pReadAccess)
Scanline pScanlineRead = pReadAccess->GetScanline( nHeightHalf );
for (tools::Long x = 0; x < nWidthHalf; ++x)
{
- if (pReadAccess->GetPixelFromData(pScanlineRead, x) != pReadAccess->GetPixelFromData(pScanlineRead, nWidth - x - 1))
- {
- return false;
- }
+ tools::Long x2 = nWidth - x - 1;
+ BitmapColor c1 = pReadAccess->GetPixelFromData(pScanlineRead, x);
+ BitmapColor c2 = pReadAccess->GetPixelFromData(pScanlineRead, x2);
+ if (c1 != c2)
+ addNewError(Point(x, nHeightHalf), Point(x2, nHeightHalf));
}
}
- return true;
+ return maNonSymmetricPoints.empty();
+}
+
+void BitmapSymmetryCheck::addNewError(Point const & rPoint1, Point const & rPoint2)
+{
+ maNonSymmetricPoints.emplace_back(rPoint1, rPoint2);
+}
+
+BitmapEx BitmapSymmetryCheck::getErrorBitmap()
+{
+ if (maSize == Size() || maNonSymmetricPoints.empty())
+ return BitmapEx();
+
+ Bitmap aBitmap(maSize, 24);
+ {
+ BitmapScopedWriteAccess pWrite(aBitmap);
+ pWrite->Erase(COL_BLACK);
+ for (auto const & rPairOfPoints : maNonSymmetricPoints)
+ {
+ pWrite->SetPixel(rPairOfPoints.first.Y(), rPairOfPoints.first.X(), COL_LIGHTRED);
+ pWrite->SetPixel(rPairOfPoints.second.Y(), rPairOfPoints.second.X(), COL_LIGHTGREEN);
+ }
+ }
+ return BitmapEx(aBitmap);
}
More information about the Libreoffice-commits
mailing list