Fixed #782

ObjectVision · Oct 1, 2024 · cc5774b · cc5774b
1 parent a3dff8a
commit cc5774b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/clc/dll/src/Subset.cpp b/clc/dll/src/Subset.cpp
@@ -476,7 +476,21 @@ struct CollectWithAttrOperator : public BinaryOperator
 				continue;
 			subDataItem->UpdateMetaInfo();
 			if (!sourceDomain->UnifyDomain(subDataItem->GetAbstrDomainUnit()))
+			{
+				if (m_CollectMode == collect_mode::org_rel)
+					reportF(SeverityTypeID::ST_Warning, "%s: image of org_rel is %s, which is incompatible with the domain of attribute %s, which is %s"
+						, GetGroup()->GetNameStr()
+						, subDataItem->GetFullName().c_str()
+						, subDataItem->GetAbstrDomainUnit()->GetFullName().c_str()
+					);
+				else
+					reportF(SeverityTypeID::ST_Warning, "%s: domain of condition is %s, which is incompatible with the domain of attribute %s, which is %s"
+					,	GetGroup()->GetNameStr()
+					,	subDataItem->GetFullName().c_str()
+					,	subDataItem->GetAbstrDomainUnit()->GetFullName().c_str()
+					);
 				continue;
+			}
 			auto resSub = CreateDataItem(resultHolder, subDataID, domainA, subDataItem->GetAbstrValuesUnit(), subDataItem->GetValueComposition());
 
 			SharedStr collectExpr;

diff --git a/qtgui/exe/GeoDmsGuiQt.vcxproj b/qtgui/exe/GeoDmsGuiQt.vcxproj
@@ -48,7 +48,7 @@
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings">
-    <QtInstall>6.6.2_msvc2019_64</QtInstall>
+    <QtInstall>6.7.2_msvc2019_64</QtInstall>
     <QtModules>core;gui;widgets;printsupport;webenginewidgets</QtModules>
     <QtDeploy>true</QtDeploy>
   </PropertyGroup>