some fixes

MapView add contrast property
MapView fix plugin

.clang-format

@@ -0,0 +1,224 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: Left
+AlignConsecutiveAssignments:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakInheritanceList: BeforeComma
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     140
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: CurrentLine
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+AllowAllConstructorInitializersOnNextLine: true
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+  - piForeach
+  - piForeachC
+  - piForeachR
+  - piForeachRC
+  - piForeachCR
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Regroup
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: false
+IndentPPDirectives: AfterHash
+IndentExternBlock: NoIndent
+IndentRequiresClause: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertTrailingCommas: Wrapped
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Middle
+PPIndentWidth:   2
+ReferenceAlignment: Middle
+ReflowComments:  true
+RemoveBracesLLVM: false
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: false
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: false
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   false
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Both
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: After
+Standard:        c++11
+StatementAttributeLikeMacros:
+  - Q_EMIT
+  - PIMETA
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+  - PRIVATE_DECLARATION
+  - NO_COPY_CLASS
+  - FOREVER_WAIT
+  - WAIT_FOREVER
+TabWidth:        4
+UseCRLF:         false
+UseTab:          AlignWithSpaces
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+  - PIMETA
+...
+

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*.{h,c,cpp}]
+charset = utf-8
+indent_style = tab
+tab_width = 4

CMakeLists.txt

@@ -1,13 +1,13 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 cmake_policy(SET CMP0072 NEW) #  FindOpenGL prefers GLVND by default
-project(qad)
+project(QAD)
-set(qad_MAJOR    2)
+set(QAD_MAJOR    2)
-set(qad_MINOR    8)
+set(QAD_MINOR    32)
-set(qad_REVISION 1)
+set(QAD_REVISION 2)
-set(qad_SUFFIX   )
+set(QAD_SUFFIX   )
-set(qad_COMPANY  SHS)
+set(QAD_COMPANY  SHS)
-set(qad_DOMAIN   org.SHS)
+set(QAD_DOMAIN   org.SHS)
 
 if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
 	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -15,7 +15,7 @@ endif()
 
 include(SHSTKMacros)
 include(QtWraps)
-shstk_begin_project(qad QAD)
+shstk_begin_project(QAD)
 include(SHSTKQtMacros)
 
 shstk_qt_founded(QtVersions)
@@ -34,12 +34,12 @@ option(DESIGNER_PLUGINS "Build Qt designer plugins" ${_plugins_default_})
 option(HAS_GL "Build with OpenGL" ${_plugins_default_})
 
 macro(qad_library NAME _MODULES _LIBS)
-	shstk_qad_project(qad_${NAME} FALSE "qad" "${_MODULES}" "${_LIBS}" ${ARGN})
+	shstk_qad_project(qad_${NAME} FALSE "QAD" "${_MODULES}" "${_LIBS}" ${ARGN})
 	shstk_qad_install("qad" FALSE qad_${NAME} "${out_HDR}" "out_QM")
 endmacro()
 
 macro(qad_application NAME _MODULES _LIBS)
-	shstk_qad_project(${NAME} TRUE "qad" "${_MODULES}" "${_LIBS}" ${ARGN})
+	shstk_qad_project(${NAME} TRUE "QAD" "${_MODULES}" "${_LIBS}" ${ARGN})
 	shstk_qad_install("qad" TRUE ${NAME} "" "out_QM")
 endmacro()
 
@@ -47,7 +47,7 @@ macro(qad_plugin NAME _MODULES _LIBS)
 	shstk_qad_plugin(qad_${NAME} "${_MODULES}" "qad_${NAME};${_LIBS}")
 endmacro()
 
-shstk_install(qad FALSE "" "${qad_VERSION_FILE}")
+shstk_install(qad FALSE "" "${QAD_VERSION_FILE}")
 file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in")
 install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
 
@@ -58,9 +58,9 @@ endif()
 
 message("----------QAD----------")
 message(" Build for ${QtVersions}")
-message(" Version: ${qad_VERSION} ")
+message(" Version: ${QAD_VERSION} ")
-message(" Linkage: ${qad_LIB_TYPE_MSG}")
+message(" Linkage: ${QAD_LIB_TYPE_MSG}")
-message(" Type   : ${qad_BUILD_TYPE}")
+message(" Type   : ${QAD_BUILD_TYPE}")
 if (NOT LOCAL)
 	message(" Install: \"${CMAKE_INSTALL_PREFIX}\"")
 else()

cmake/FindQAD.cmake

@@ -6,9 +6,12 @@ Create imported targets:
   * QAD::Application
   * QAD::Blockview
   * QAD::Graphic
+  * QAD::GraphicAnalysis
+  * QAD::Graphic3D
   * QAD::SQLTable
   * QAD::TouchWidgets
   * QAD::Doc
+  * QAD::VirtualKeyboard
   * QAD::PIQt
   * QAD::PIQtUtils
 
@@ -19,7 +22,7 @@ These targets include directories and dependencies
 cmake_policy(SET CMP0011 NEW) # don`t affect includer policies
 cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain target on Windows
 
-if(NOT BUILDING_qad)
+if(NOT BUILDING_QAD)
 	find_package(PIP QUIET)
 	include(QtWraps)
 	include(SHSTKMacros)
@@ -27,40 +30,43 @@ endif()
 
 shstk_is_parent_exists(hasParent PARENT_DIRECTORY)
 
-shstk_set_find_dirs(qad)
+shstk_set_find_dirs(QAD)
-set(_SEARCH_DIR ${qad_LIBDIR})
 
 qad_find_qt(Core QUIET)
 if(NOT SOME_QT_FOUND)
-	message(WARNING "No qt found, please install qt")
+	message(WARNING "No Qt found, please install Qt")
 	set(QAD_FOUND OFF CACHE BOOL "")
 	return()
 endif()
 
-if (NOT BUILDING_qad)
+if (NOT BUILDING_QAD)
-	list(APPEND _SEARCH_DIR $ENV{SMSDK_DIR}/lib)
+	shstk_find_header(QAD "qad_version.h" ${QAD_INCDIR})
-	shstk_find_header(qad QAD "qad_version.h" "")
 endif()
 
 if(QAD_FIND_VERSION VERSION_GREATER QAD_VERSION)
 	message(FATAL_ERROR "QAD version ${QAD_VERSION} is available, but ${QAD_FIND_VERSION} requested!")
 endif()
 
-set(__libs "utils;widgets;application;blockview;graphic;sql_table;touch_widgets;doc")
+set(__libs "utils;widgets;application;blockview;graphic;graphic_analysis;graphic3d;sql;sql_table;touch_widgets;doc;map;virtual_keyboard")
-if (PIP_FOUND OR BUILDING_pip)
+if (PIP_FOUND OR BUILDING_PIP)
 	list(APPEND __libs "piqt;piqt_utils")
 endif()
 
-set(__module_utils          Utils        )
+set(__module_utils            Utils          )
-set(__module_widgets        Widgets      )
+set(__module_widgets          Widgets        )
-set(__module_application    Application  )
+set(__module_application      Application    )
-set(__module_blockview      Blockview    )
+set(__module_blockview        Blockview      )
-set(__module_graphic        Graphic      )
+set(__module_graphic          Graphic        )
-set(__module_sql_table      SQLTable     )
+set(__module_graphic_analysis GraphicAnalysis)
-set(__module_touch_widgets  TouchWidgets )
+set(__module_graphic3d        Graphic3D      )
-set(__module_doc            Doc          )
+set(__module_sql              SQL            )
-set(__module_piqt           PIQt         )
+set(__module_sql_table        SQLTable       )
-set(__module_piqt_utils     PIQtUtils    )
+set(__module_touch_widgets    TouchWidgets   )
+set(__module_doc              Doc            )
+set(__module_map              Map            )
+set(__module_piqt             PIQt           )
+set(__module_piqt_utils       PIQtUtils      )
+set(__module_virtual_keyboard VirtualKeyboard)
 
 foreach (_l ${__libs})
 	set( __inc_${_l} "")
@@ -68,20 +74,23 @@ foreach (_l ${__libs})
 	set(__libs_${_l} "")
 endforeach()
 
-set(__deps_widgets       "QAD::Utils")
+set(__deps_widgets          "QAD::Utils")
-set(__deps_application   "QAD::Widgets")
+set(__deps_application      "QAD::Widgets")
-set(__deps_blockview     "QAD::Widgets")
+set(__deps_blockview        "QAD::Widgets")
-set(__deps_graphic       "QAD::Widgets")
+set(__deps_graphic          "QAD::Widgets")
-set(__deps_sql_table     "QAD::Widgets")
+set(__deps_graphic_analysis "QAD::Graphic;PIP::FFTW")
-set(__deps_piqt          "QAD::Widgets;PIP")
+set(__deps_sql_table        "QAD::Widgets")
-set(__deps_piqt_utils    "QAD::Blockview;QAD::PIQt")
+set(__deps_map              "QAD::Utils;QAD::PIQt")
+set(__deps_piqt             "QAD::Widgets;PIP")
+set(__deps_piqt_utils       "QAD::Blockview;QAD::PIQt")
+set(__deps_virtual_keyboard "QAD::PIQt")
 
-#message("find QAD ${BUILDING_qad}")
+#message("find QAD ${BUILDING_QAD}")
 
-if (BUILDING_qad)
+if (BUILDING_QAD)
 
-	if (NOT SET_TARGETS_qad)
+	if (NOT SET_TARGETS_QAD)
-		set(SET_TARGETS_qad ON CACHE BOOL "")
+		set(SET_TARGETS_QAD ON CACHE BOOL "")
 		#message("create aliases")
 		foreach(_l ${__libs})
 			foreach(_v ${_QT_VERSIONS_})
@@ -104,7 +113,7 @@ else()
 	foreach(_l ${__libs})
 		foreach(_v ${_QT_VERSIONS_})
 			set(_m ${__module_${_l}})
-			find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${_SEARCH_DIR})
+			find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${QAD_LIBDIR})
 			#message("found ${_l}${_v} = ${QAD_LIBRARY_${_l}${_v}}")
 			if((NOT TARGET QAD::${_m}${_v}) AND QAD_LIBRARY_${_l}${_v})
 				#message("imported QAD::${_m}${_v} = ${QAD_LIBRARY_${_l}${_v}}")
@@ -120,7 +129,7 @@ else()
 				endforeach()
 				set_target_properties(QAD::${_m}${_v} PROPERTIES
 					IMPORTED_LOCATION "${QAD_LIBRARY_${_l}${_v}}"
-					INTERFACE_INCLUDE_DIRECTORIES "${qad_INCLUDES}"
+					INTERFACE_INCLUDE_DIRECTORIES "${QAD_INCLUDES}"
 					INTERFACE_LINK_LIBRARIES "${_deps}")
 			endif()
 		endforeach()

cmake/QtWraps.cmake

@@ -137,6 +137,9 @@ endif()
 if (POLICY CMP0074)
 	cmake_policy(SET CMP0074 NEW) # ignore <PackageName>_ROOT variables
 endif()
+if (POLICY CMP0177)
+	cmake_policy(SET CMP0177 OLD)
+endif()
 set(__qt_bug_modules "UiTools")
 
 set(__qt_modules_4 "CLucene;Core;Declarative;Gui;Help;main;Multimedia;Network;OpenGL;\
@@ -503,24 +506,24 @@ macro(qad_wrap)
 		get_filename_component(_EXT "${_i}" EXT)
 		#message("${_EXT}")
 		if (NOT ("x${_EXT}" STREQUAL "x"))
-			if (("x${_EXT}" STREQUAL "x.h") OR ("x${_EXT}" STREQUAL "x.hpp"))
+			if ("${_EXT}" MATCHES ".*\\.h(pp)?$")
 				list(APPEND H_LIST "${_i}")
 				#message("header")
 			endif()
-			if (("x${_EXT}" STREQUAL "x.c") OR ("x${_EXT}" STREQUAL "x.cpp") OR ("x${_EXT}" STREQUAL "x.cxx"))
+			if ("${_EXT}" MATCHES ".*\\.c((pp)|(xx))?$")
 				list(APPEND CPP_LIST "${_i}")
 				#message("source")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.ui")
+			if ("${_EXT}" MATCHES ".*\\.ui$")
 				list(APPEND UI_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.qrc")
+			if ("${_EXT}" MATCHES ".*\\.qrc$")
 				list(APPEND RES_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.rc")
+			if ("${_EXT}" MATCHES ".*\\.rc$")
 				list(APPEND RC_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.ts")
+			if ("${_EXT}" MATCHES ".*\\.ts$")
 				list(APPEND TS_LIST "${_i}")
 			endif()
 		endif()
@@ -723,7 +726,7 @@ macro(qad_target_link_libraries _NAME)
 					list(APPEND _ARGS ${_i})
 				endif()
 			endforeach()
-			target_link_libraries(${_TARGET} ${Qt${_v}_LIBRARIES} ${_ARGS})
+			target_link_libraries(${_TARGET} ${_ARGS} ${Qt${_v}_LIBRARIES})
 			#message("link ${_TARGET}: ${Qt${_v}_LIBRARIES} ${_ARGS}")
 		endif()
 	endforeach()
@@ -923,6 +926,18 @@ macro(qad_install_lang _NAME)
 						string(SUBSTRING "${_libname}" 0 ${_sl} _libname)
 						string(REPLACE "::" "_" _libname "${_libname}")
 						string(TOLOWER "${_libname}" _libname )
+						if ("${_libname}" STREQUAL "qad_piqtutils")
+							set(_libname "qad_piqt_utils")
+						endif()
+						if ("${_libname}" STREQUAL "qad_sqltable")
+							set(_libname "qad_sql_table")
+						endif()
+						if ("${_libname}" STREQUAL "qad_touchwidgets")
+							set(_libname "qad_touch_widgets")
+						endif()
+						if ("${_libname}" STREQUAL "qad_graphicanalysis")
+							set(_libname "qad_graphic_analysis")
+						endif()
 						#message("imp lib \"${_libname}\"")
 						list(APPEND _qt_libs ${_libname})
 					endif()
@@ -932,6 +947,7 @@ macro(qad_install_lang _NAME)
 				list(APPEND _qt_libs "qtbase")
 				foreach (_i ${${PROJECT_NAME}_LANG})
 					foreach (_l ${_qt_libs})
+						#message("lib = \"${_l}\"")
 						unset(_qm_path CACHE)
 						find_file(_qm_path "${_l}_${_i}.qm" PATHS "${Qt${_v}_LANG_DIR}" ${_PATHS} NO_DEFAULT_PATH)
 						if (EXISTS "${_qm_path}")