From 1b94e22897083b8f74c88c53bed3d871befc94df Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Wed, 10 Sep 2025 18:31:12 +0100 Subject: [PATCH] Testing - Remove QANCollection package (#718) - Removes all QANCollection header and source files that contained collection type definitions and test utilities - Updates the build configuration to remove QANCollection from the package list - Removes the QANCollection integration from the main QADraw factory --- src/Draw/TKQADraw/PACKAGES.cmake | 1 - src/Draw/TKQADraw/QADraw/QADraw.cxx | 2 - src/Draw/TKQADraw/QANCollection/FILES.cmake | 17 ------ .../TKQADraw/QANCollection/QANCollection.cxx | 24 -------- .../TKQADraw/QANCollection/QANCollection.hxx | 33 ----------- .../QANCollection/QANCollection_Common.cxx | 55 ------------------- .../QANCollection/QANCollection_Common.hxx | 34 ------------ ...tion_DataMapIteratorOfDataMapOfRealPnt.hxx | 19 ------- .../QANCollection_DataMapOfRealPnt.hxx | 26 --------- ...bleMapIteratorOfDoubleMapOfRealInteger.hxx | 19 ------- .../QANCollection_DoubleMapOfRealInteger.hxx | 26 --------- .../QANCollection_IndexedDataMapOfRealPnt.hxx | 24 -------- .../QANCollection_ListIteratorOfListOfPnt.hxx | 19 ------- .../QANCollection/QANCollection_ListOfPnt.hxx | 25 --------- 14 files changed, 324 deletions(-) delete mode 100644 src/Draw/TKQADraw/QANCollection/FILES.cmake delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection.cxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection.hxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_Common.cxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_Common.hxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_DataMapOfRealPnt.hxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapOfRealInteger.hxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_IndexedDataMapOfRealPnt.hxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_ListIteratorOfListOfPnt.hxx delete mode 100644 src/Draw/TKQADraw/QANCollection/QANCollection_ListOfPnt.hxx diff --git a/src/Draw/TKQADraw/PACKAGES.cmake b/src/Draw/TKQADraw/PACKAGES.cmake index cecd38b003..05f9a6a5bb 100644 --- a/src/Draw/TKQADraw/PACKAGES.cmake +++ b/src/Draw/TKQADraw/PACKAGES.cmake @@ -3,5 +3,4 @@ set(OCCT_TKQADraw_LIST_OF_PACKAGES QABugs QADNaming QADraw - QANCollection ) diff --git a/src/Draw/TKQADraw/QADraw/QADraw.cxx b/src/Draw/TKQADraw/QADraw/QADraw.cxx index 65f12d33d9..58ab87e4ad 100644 --- a/src/Draw/TKQADraw/QADraw/QADraw.cxx +++ b/src/Draw/TKQADraw/QADraw/QADraw.cxx @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -175,7 +174,6 @@ void QADraw::Factory(Draw_Interpretor& theCommands) QABugs::Commands(theCommands); QADNaming::AllCommands(theCommands); - QANCollection::Commands(theCommands); } // Declare entry point PLUGINFACTORY diff --git a/src/Draw/TKQADraw/QANCollection/FILES.cmake b/src/Draw/TKQADraw/QANCollection/FILES.cmake deleted file mode 100644 index 5d65ef6ad5..0000000000 --- a/src/Draw/TKQADraw/QANCollection/FILES.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# Source files for QANCollection package -set(OCCT_QANCollection_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}") - -set(OCCT_QANCollection_FILES - FILES - QANCollection.cxx - QANCollection.hxx - QANCollection_Common.cxx - QANCollection_Common.hxx - QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx - QANCollection_DataMapOfRealPnt.hxx - QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx - QANCollection_DoubleMapOfRealInteger.hxx - QANCollection_IndexedDataMapOfRealPnt.hxx - QANCollection_ListIteratorOfListOfPnt.hxx - QANCollection_ListOfPnt.hxx -) diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection.cxx b/src/Draw/TKQADraw/QANCollection/QANCollection.cxx deleted file mode 100644 index d2abbd2257..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection.cxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2004-03-05 -// Created by: Mikhail KUZMITCHEV -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include - -void QANCollection::Commands(Draw_Interpretor& theCommands) -{ - // All QANCollection commands have been migrated to GTest format - // This function is kept for compatibility but does nothing - (void)theCommands; // Avoid unused parameter warning -} diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection.hxx deleted file mode 100644 index 2268a073cf..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection.hxx +++ /dev/null @@ -1,33 +0,0 @@ -// Created on: 2004-03-05 -// Created by: Mikhail KUZMITCHEV -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _QANCollection_HeaderFile -#define _QANCollection_HeaderFile - -#include -#include -#include - -#include - -class QANCollection -{ -public: - DEFINE_STANDARD_ALLOC - - Standard_EXPORT static void Commands(Draw_Interpretor& DI); -}; - -#endif // _QANCollection_HeaderFile diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_Common.cxx b/src/Draw/TKQADraw/QANCollection/QANCollection_Common.cxx deleted file mode 100644 index b505356ec3..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_Common.cxx +++ /dev/null @@ -1,55 +0,0 @@ -// Created on: 2002-04-30 -// Created by: Alexander KARTOMIN (akm) -// Copyright (c) 2002-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -// Purpose: To test all methods of all NCollection classes - -#include -#include - -void PrintItem(const gp_Pnt& thePnt) -{ - printf(" (%5.1f %5.1f %5.1f)\n", thePnt.X(), thePnt.Y(), thePnt.Z()); -} - -void PrintItem(const Standard_Real theDbl) -{ - printf(" (%5.1f)\n", theDbl); -} - -void Random(Standard_Real& theValue) -{ - static Standard_Real dfV = 0.14159265358979323846; - dfV *= 37.; - dfV -= Floor(dfV); - theValue = dfV; - // theValue=drand48(); -} - -void Random(Standard_Integer& theValue, const Standard_Integer theMax) -{ - Standard_Real dfR; - Random(dfR); - theValue = RealToInt(theMax * dfR); -} - -void Random(gp_Pnt& thePnt) -{ - // thePnt.SetCoord(drand48(),drand48(),drand48()); - Standard_Real dfX, dfY, dfZ; - Random(dfX); - Random(dfY); - Random(dfZ); - thePnt.SetCoord(dfX, dfY, dfZ); -} diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_Common.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_Common.hxx deleted file mode 100644 index 5e0fb327dd..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_Common.hxx +++ /dev/null @@ -1,34 +0,0 @@ -// Created on: 2002-05-15 -// Created by: Alexander KARTOMIN (akm) -// Copyright (c) 2002-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef QANCollection_Common_HeaderFile -#define QANCollection_Common_HeaderFile - -#include - -// ===================== Methods for accessing items/keys ===================== - -// To print other type of items define PrintItem for it - -Standard_EXPORT void PrintItem(const gp_Pnt& thePnt); -Standard_EXPORT void PrintItem(const Standard_Real theDbl); - -// So do for the pseudo-random generation - -Standard_EXPORT void Random(Standard_Real& theValue); -Standard_EXPORT void Random(Standard_Integer& theValue, const Standard_Integer theMax = RAND_MAX); -Standard_EXPORT void Random(gp_Pnt& thePnt); - -#endif diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx deleted file mode 100644 index 43b4132f99..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 2015 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef QANCollection_DataMapIteratorOfDataMapOfRealPnt_HeaderFile -#define QANCollection_DataMapIteratorOfDataMapOfRealPnt_HeaderFile - -#include - -#endif diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapOfRealPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapOfRealPnt.hxx deleted file mode 100644 index 6a6f9d6316..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapOfRealPnt.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 2004-03-05 -// Created by: Mikhail KUZMITCHEV -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef QANCollection_DataMapOfRealPnt_HeaderFile -#define QANCollection_DataMapOfRealPnt_HeaderFile - -#include -#include - -typedef NCollection_DataMap QANCollection_DataMapOfRealPnt; -typedef NCollection_DataMap::Iterator - QANCollection_DataMapIteratorOfDataMapOfRealPnt; - -#endif diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx deleted file mode 100644 index da6a22a21b..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 2015 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger_HeaderFile -#define QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger_HeaderFile - -#include - -#endif diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapOfRealInteger.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapOfRealInteger.hxx deleted file mode 100644 index 7f75f66ec7..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapOfRealInteger.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 2004-03-05 -// Created by: Mikhail KUZMITCHEV -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef QANCollection_DoubleMapOfRealInteger_HeaderFile -#define QANCollection_DoubleMapOfRealInteger_HeaderFile - -#include -#include - -typedef NCollection_DoubleMap QANCollection_DoubleMapOfRealInteger; -typedef NCollection_DoubleMap::Iterator - QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger; - -#endif diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_IndexedDataMapOfRealPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_IndexedDataMapOfRealPnt.hxx deleted file mode 100644 index 61311f5f1c..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_IndexedDataMapOfRealPnt.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2004-03-05 -// Created by: Mikhail KUZMITCHEV -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef QANCollection_IndexedDataMapOfRealPnt_HeaderFile -#define QANCollection_IndexedDataMapOfRealPnt_HeaderFile - -#include -#include - -typedef NCollection_IndexedDataMap QANCollection_IndexedDataMapOfRealPnt; - -#endif diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_ListIteratorOfListOfPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_ListIteratorOfListOfPnt.hxx deleted file mode 100644 index b92a1cf349..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_ListIteratorOfListOfPnt.hxx +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 2015 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef QANCollection_ListIteratorOfListOfPnt_HeaderFile -#define QANCollection_ListIteratorOfListOfPnt_HeaderFile - -#include - -#endif diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_ListOfPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_ListOfPnt.hxx deleted file mode 100644 index bfc0ad5057..0000000000 --- a/src/Draw/TKQADraw/QANCollection/QANCollection_ListOfPnt.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Created on: 2004-03-05 -// Created by: Mikhail KUZMITCHEV -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef QANCollection_ListOfPnt_HeaderFile -#define QANCollection_ListOfPnt_HeaderFile - -#include -#include - -typedef NCollection_List QANCollection_ListOfPnt; -typedef NCollection_List::Iterator QANCollection_ListIteratorOfListOfPnt; - -#endif -- 2.39.5