search, tags

Source/GraffModule/Private/cppFuncLibrary.cpp

@@ -231,7 +231,7 @@ void UcppFuncLibrary::getRange(double value, double minMult, double maxMult, dou
 	bValue = value;
 }
 
-void UcppFuncLibrary::updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, TArray<bool> houses, TArray<bool> sections, TArray<bool> rooms, TArray<bool> Tags, int sortType, bool onlyAvailable, TArray<FcppflatStruct>& filtered, int& count, TArray<FIntPoint> houseMap)
+void UcppFuncLibrary::updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, int zone, TArray<bool> houses, TArray<bool> sections, TArray<bool> rooms, TArray<bool> Tags, int sortType, bool onlyAvailable, TArray<FcppflatStruct>& filtered, int& count, TArray<FIntPoint> houseMap)
 {
 	for (auto& hm : houseMap) {
 
@@ -247,6 +247,7 @@ void UcppFuncLibrary::updateFilterList(UObject* WorldContextObject, int floorMin
 			&& inRange(flat.Square, sqMin, sqMax)
 			//&& boolGet(houses, flat.House)
 			//&& boolGet(sections, flat.Section)
+			&& (zone<1?true:zone==flat.Zone)
 			&& [](TArray<FIntPoint>& houseMap_, TArray<bool>& houses_, TArray<bool>& sections_, FcppflatStruct& flat_) {
 				if (houseMap_.IsEmpty()) return boolGet(houses_, flat_.House) && boolGet(sections_, flat_.Section); //if no map use classic
 					if (!houses_.Contains(true)) return true; //if no select then pass

Source/GraffModule/Public/cppFuncLibrary.h

@@ -169,7 +169,7 @@ class GRAFFMODULE_API UcppFuncLibrary : public UBlueprintFunctionLibrary
 	use housemap to remap houses array to house-section pair. example: 0:1,1 1:2,1 2:2,2...
 	sections array will be ignored if using housemap*/
 	UFUNCTION(blueprintcallable, category = "Widget|Search", meta = (WorldContext = "WorldContextObject"))
-	static	void updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, TArray<bool> houses, TArray<bool> sections, TArray<bool> rooms, TArray<bool> Tags, int sortType, bool onlyAvailable, TArray<FcppflatStruct>& filtered, int& count, TArray<FIntPoint> houseMap);
+	static	void updateFilterList(UObject* WorldContextObject, int floorMin, int floorMax, float sqMin, float sqMax, int priceMin, int priceMax, int zone, TArray<bool> houses, TArray<bool> sections, TArray<bool> rooms, TArray<bool> Tags, int sortType, bool onlyAvailable, TArray<FcppflatStruct>& filtered, int& count, TArray<FIntPoint> houseMap);
 	/*additional info in comment: n=int;sqFrom=float;sqTo=float*/
 	UFUNCTION(blueprintcallable, category = "Widget|Search")
 	static void groupFiltered(UPARAM(ref) TArray<FcppflatStruct>& filtered, UPARAM(ref) TArray<FcppflatStruct>& filtered_grouped);