From e435aa61e00362e3fd56ae525bc9b47b85499f77 Mon Sep 17 00:00:00 2001 From: franjo Date: Sat, 2 Mar 2013 22:43:04 +0000 Subject: [PATCH] Replaced all tab characters with spaces git-svn-id: https://pl5.projectlocker.com/igui/meshGeneration/svn@5 fdcce57e-7e00-11e2-b579-49867b4cea03 --- GUI/GTK/generalPage/generalpage.glade | 808 +++---- .../keepcellsintersectingpatches.glade | 450 ++-- GUI/GTK/localRefinement/localrefinement.glade | 860 +++---- .../localsettingsmainwindow.glade | 84 +- GUI/GTK/mainWindow/mainwindow.glade | 240 +- GUI/Make/options | 56 +- GUI/meshGenGTK/helpers/gtkHelpers.C | 64 +- GUI/meshGenGTK/meshGenGTK.C | 50 +- GUI/meshGenGTK/meshGenGTK.H | 82 +- GUI/meshGenGTK/meshGenGTKBndLayers.C | 690 +++--- GUI/meshGenGTK/meshGenGTKBoxRefinement.C | 1802 +++++++------- GUI/meshGenGTK/meshGenGTKConeRefinement.C | 2152 ++++++++--------- GUI/meshGenGTK/meshGenGTKGeneralPage.C | 856 +++---- .../meshGenGTKKeepCellsIntersectingPatches.C | 666 ++--- GUI/meshGenGTK/meshGenGTKLineRefinement.C | 1814 +++++++------- GUI/meshGenGTK/meshGenGTKLocalRefinement.C | 974 ++++---- .../meshGenGTKLocalSettingsMainWindow.C | 164 +- GUI/meshGenGTK/meshGenGTKMainWindow.C | 270 +-- .../meshGenGTKObjectRefinementMainWindow.C | 144 +- GUI/meshGenGTK/meshGenGTKRenameBoundary.C | 2090 ++++++++-------- GUI/meshGenGTK/meshGenGTKSphereRefinement.C | 1548 ++++++------ GUI/meshGenGUI/meshGenGUI.C | 20 +- GUI/meshGenGUI/meshGenGUI.H | 202 +- GUI/meshGenGUI/meshGenGUIBndLayers.C | 88 +- GUI/meshGenGUI/meshGenGUIGeneral.C | 116 +- .../meshGenGUIKeepCellsIntersectingPatches.C | 88 +- GUI/meshGenGUI/meshGenGUIObjectRefinement.C | 134 +- GUI/meshGenGUI/meshGenGUIPatchRefinement.C | 84 +- GUI/meshGenGUI/meshGenGUIRenameBoundary.C | 346 +-- GUI/meshGenQt/meshGenQt.C | 84 +- GUI/meshGenQt/meshGenQt.H | 56 +- GUI/meshGenQt/meshGenQtGeneralSettings.C | 436 ++-- GUI/meshGenQt/meshGenQtGeneralSettings.H | 96 +- executables/cartesianMesh/cartesianMesh.C | 2 +- executables/dualMesh/dualMesh.C | 8 +- executables/hexMesh/hexMesh.C | 2 +- executables/pMesh/pMesh.C | 2 +- executables/tetMesh/tetMesh.C | 2 +- .../cartesianMeshExtractor.C | 42 +- .../cartesianMeshExtractor.H | 44 +- ...artesianMeshExtractorDecomposeSplitHexes.C | 12 +- ...artesianMeshExtractorPointsAndAddressing.C | 8 +- .../cartesianMeshExtractorPolyMesh.C | 28 +- .../cartesianMeshGenerator.C | 310 +-- .../cartesianMeshGenerator.H | 54 +- .../dualMeshExtractor/dualMeshExtractor.C | 64 +- .../dualMeshExtractor/dualMeshExtractor.H | 138 +- .../dualMeshExtractorDecompose.C | 1144 ++++----- .../dualMeshExtractorPolyMesh.C | 218 +- .../dualMeshGenerator/dualMeshGenerator.C | 348 +-- .../dualMeshGenerator/dualMeshGenerator.H | 54 +- .../dualUnfoldConcaveCells.C | 132 +- .../dualUnfoldConcaveCells.H | 142 +- .../dualUnfoldConcaveCellsMergeFaces.C | 486 ++-- ...lUnfoldConcaveCellsMergeFacesConsistency.C | 656 ++--- .../hexMeshExtractor/hexMeshExtractor.C | 18 +- .../hexMeshExtractor/hexMeshExtractor.H | 10 +- .../hexMeshGenerator/hexMeshGenerator.C | 24 +- .../hexMeshGenerator/hexMeshGenerator.H | 48 +- .../boundaryLayers/boundaryLayerCells.C | 1158 ++++----- .../utilities/boundaryLayers/boundaryLayers.C | 264 +- .../utilities/boundaryLayers/boundaryLayers.H | 278 +-- .../boundaryLayersCreateVertices.C | 952 ++++---- .../boundaryLayersFacesAndCells.C | 236 +- .../boundaryLayers/boundaryLayersI.H | 480 ++-- .../boundaryLayersWrapperLayer.C | 48 +- .../utilities/boundaryLayers/extrudeLayer.H | 18 +- .../utilities/checkMeshDict/checkMeshDict.C | 2 +- .../utilities/checkMeshDict/checkMeshDict.H | 30 +- .../utilities/containers/DynList/DynList.H | 24 +- .../utilities/containers/DynList/DynListI.H | 48 +- .../utilities/containers/FRWGraph/FRWGraph.C | 36 +- .../utilities/containers/FRWGraph/FRWGraph.H | 2 +- .../utilities/containers/FRWGraph/FRWGraphI.H | 142 +- .../utilities/containers/Graphs/cellIOGraph.C | 12 +- .../utilities/containers/Graphs/cellIOGraph.H | 4 +- .../utilities/containers/Graphs/faceIOGraph.C | 12 +- .../utilities/containers/Graphs/faceIOGraph.H | 4 +- .../containers/IODynList/IODynList.C | 18 +- .../containers/IOLongList/IOLongList.C | 18 +- .../IOLongList/IOLongListInstances.C | 12 +- .../IOLongList/IOLongListInstances.H | 4 +- .../utilities/containers/Lists/cellListPMG.H | 88 +- .../utilities/containers/Lists/cellListPMGI.H | 82 +- .../utilities/containers/Lists/faceListPMG.C | 10 +- .../utilities/containers/Lists/faceListPMG.H | 112 +- .../utilities/containers/Lists/faceListPMGI.H | 98 +- .../containers/Lists/pointFieldPMG.C | 8 +- .../containers/Lists/pointFieldPMG.H | 112 +- .../containers/Lists/pointFieldPMGI.H | 76 +- .../utilities/containers/LongList/LongList.C | 18 +- .../utilities/containers/LongList/LongList.H | 108 +- .../utilities/containers/LongList/LongListI.H | 258 +- .../utilities/containers/VRWGraph/VRWGraph.C | 100 +- .../utilities/containers/VRWGraph/VRWGraph.H | 232 +- .../utilities/containers/VRWGraph/VRWGraphI.H | 420 ++-- .../containers/VRWGraph/VRWGraphSMPModifier.C | 14 +- .../containers/VRWGraph/VRWGraphSMPModifier.H | 8 +- .../VRWGraph/VRWGraphSMPModifierTemplates.C | 14 +- .../containers/VRWGraphList/VRWGraphList.C | 34 +- .../containers/VRWGraphList/VRWGraphList.H | 84 +- .../containers/VRWGraphList/VRWGraphListI.H | 136 +- .../utilities/containers/graphRow/graphRow.H | 86 +- .../utilities/containers/graphRow/graphRowI.H | 76 +- .../utilities/containers/subGraph/subGraph.H | 80 +- .../utilities/containers/subGraph/subGraphI.H | 124 +- .../foamToEnsight/ensightMesh.C | 202 +- .../foamToEnsight/ensightMesh.H | 22 +- .../foamToEnsight/writeMeshEnsight.C | 64 +- .../dataConversion/foamToFLMA/flmaMesh.C | 38 +- .../dataConversion/foamToFLMA/flmaMesh.H | 20 +- .../dataConversion/foamToFLMA/writeMeshFLMA.C | 26 +- .../dataConversion/foamToFLMA/writeMeshFLMA.H | 2 +- .../dataConversion/foamToFPMA/fpmaMesh.C | 78 +- .../dataConversion/foamToFPMA/fpmaMesh.H | 8 +- .../dataConversion/foamToFPMA/writeMeshFPMA.C | 44 +- .../dataConversion/foamToFPMA/writeMeshFPMA.H | 2 +- .../octreeToEnsight/octreeMesh.C | 254 +- .../octreeToEnsight/octreeMesh.H | 18 +- .../octreeToEnsight/writeOctreeEnsight.C | 174 +- .../octreeToEnsight/writeOctreeEnsight.H | 10 +- .../octreeToFPMA/octreeMeshFPMA.C | 76 +- .../octreeToFPMA/octreeMeshFPMA.H | 22 +- .../octreeToFPMA/writeOctreeFPMA.C | 50 +- .../octreeToFPMA/writeOctreeFPMA.H | 4 +- .../simplexToFLMA/simplexMesh.C | 28 +- .../simplexToFLMA/simplexMesh.H | 20 +- .../simplexToFLMA/writeSimplexFLMA.C | 26 +- .../simplexToFLMA/writeSimplexFLMA.H | 2 +- .../utilities/decomposeCells/decomposeCells.H | 84 +- .../decomposeCellsDecomposition.C | 2 +- .../decomposeCells/decomposeCellsPyramids.C | 72 +- .../faceDecomposition/decomposeFaces.C | 2 +- .../faceDecomposition/decomposeFaces.H | 18 +- .../faceDecomposition/faceDecomposition.C | 30 +- .../faceDecomposition/faceDecomposition.H | 50 +- .../createFacesFromChain.C | 686 +++--- .../createFacesFromChain.H | 106 +- .../helperClasses/inSphereTest/inSphereTest.H | 2 +- .../helperClasses/matrices/matrix2D.H | 56 +- .../helperClasses/matrices/matrix2DI.H | 106 +- .../helperClasses/matrices/matrix3D.H | 72 +- .../helperClasses/matrices/matrix3DI.H | 148 +- .../labelledPair/labelledPair.H | 58 +- .../labelledPoint/labelledPoint.H | 20 +- .../labelledPointScalar/labelledPointScalar.H | 20 +- .../sortEdgesIntoChains/sortEdgesIntoChains.C | 384 +-- .../sortEdgesIntoChains/sortEdgesIntoChains.H | 78 +- .../helperFunctions/helperFunctionsPar.C | 6 +- .../helperFunctionsStringConversion.C | 26 +- .../helperFunctionsTopologyManipulationI.H | 514 ++-- .../meshes/partTetMesh/partTetMesh.C | 262 +- .../meshes/partTetMesh/partTetMesh.H | 146 +- .../partTetMesh/partTetMeshAddressing.C | 268 +- .../partTetMeshParallelAddressing.C | 20 +- .../meshes/partTetMesh/partTetMeshSimplex.C | 230 +- .../meshes/polyMeshGen/polyMeshGen.C | 4 +- .../meshes/polyMeshGen/polyMeshGen.H | 46 +- .../meshes/polyMeshGen/polyMeshGenFaces.C | 346 +-- .../meshes/polyMeshGen/polyMeshGenFaces.H | 148 +- .../meshes/polyMeshGen/polyMeshGenFacesI.H | 30 +- .../meshes/polyMeshGen/polyMeshGenPoints.C | 78 +- .../meshes/polyMeshGen/polyMeshGenPoints.H | 76 +- .../meshes/polyMeshGen/polyMeshGenPointsI.H | 8 +- .../polyMeshGen/writePatch/writePatch.C | 14 +- .../polyMeshGen/writePatch/writePatch.H | 24 +- .../polyMeshGen/writePatch/writePatchBase.C | 6 +- .../polyMeshGen/writePatch/writePatchBase.H | 10 +- .../writePatch/writeProcessorPatch.C | 18 +- .../writePatch/writeProcessorPatch.H | 30 +- .../polyMeshGenAddressing.H | 70 +- .../polyMeshGenAddressingCellCells.C | 2 +- .../polyMeshGenAddressingCellPoints.C | 2 +- .../polyMeshGenAddressingCentresAndAreas.C | 6 +- .../polyMeshGenAddressingCentresAndVols.C | 6 +- .../polyMeshGenAddressingPointFaces.C | 2 +- .../polyMeshGenAddressingPointPoints.C | 4 +- .../polyMeshGenAddressingUpdateGeometry.C | 290 +-- .../polyMeshGenChecksGeometry.C | 30 +- .../polyMeshGenChecksTopology.C | 4 +- .../polyMeshGenModifierAddCellByCell.C | 126 +- .../polyMeshGenModifierAddCellByCell.H | 36 +- .../polyMeshGenModifierRemoveCells.C | 88 +- .../polyMeshGenModifierRemoveFaces.C | 88 +- .../polyMeshGenModifierRemoveUnusedVertices.C | 2 +- .../polyMeshGenModifierRenumberMesh.C | 4 +- .../polyMeshGenModifierReorderBoundaryFaces.C | 4 +- .../polyMeshGenModifierZipUpCells.C | 102 +- .../primitives/meshSubsets/meshSubset.H | 16 +- .../meshes/primitives/partTet/partTet.H | 72 +- .../meshes/primitives/partTet/partTetI.H | 166 +- .../utilities/meshes/triSurf/triSurf.C | 198 +- .../utilities/meshes/triSurf/triSurf.H | 4 +- .../meshOctreeAddressing.C | 192 +- .../meshOctreeAddressing.H | 164 +- .../meshOctreeAddressingCreation.C | 650 ++--- .../meshOctreeAddressingGluedMesh.C | 166 +- .../meshOctreeAddressingI.H | 54 +- ...meshOctreeAddressingIrregularConnections.C | 2 +- .../meshOctreeAutomaticRefinement.C | 8 +- .../meshOctreeAutomaticRefinement.H | 6 +- .../meshOctreeAutomaticRefinementRef.C | 6 +- .../meshOctreeFindNearestSurfacePoint.C | 4 +- .../octrees/meshOctree/meshOctreeI.H | 16 +- .../meshOctreeModifier/meshOctreeModifier.C | 2 +- .../meshOctreeModifierParallelRefinement.C | 4 +- .../meshOctree/meshOctreeNeighbourSearches.C | 2 +- .../objectRefinement/boxRefinement.C | 174 +- .../objectRefinement/boxRefinement.H | 96 +- .../objectRefinement/coneRefinement.C | 144 +- .../objectRefinement/coneRefinement.H | 72 +- .../objectRefinement/lineRefinement.C | 66 +- .../objectRefinement/lineRefinement.H | 60 +- .../objectRefinement/newObjectRefinement.C | 2 +- .../objectRefinement/objectRefinement.C | 12 +- .../objectRefinement/objectRefinementList.H | 2 +- .../objectRefinement/sphereRefinement.C | 68 +- .../objectRefinement/sphereRefinement.H | 60 +- .../patchRefinement/patchRefinement.C | 4 +- .../patchRefinement/patchRefinement.H | 4 +- .../patchRefinement/patchRefinementList.H | 2 +- .../surfaceIntersectionsOctree.C | 4 +- .../surfaceIntersectionsOctreeCube.H | 24 +- .../geometry/meshOptimizer/meshOptimizer.C | 28 +- .../geometry/meshOptimizer/meshOptimizer.H | 46 +- .../meshOptimizerOptimizePoint.C | 4 +- .../meshOptimizerOptimizePointParallel.C | 250 +- .../meshOptimizerOptimizeSurface.C | 12 +- .../geometry/meshOptimizer/optimizeMeshFV.C | 154 +- .../knuppMetric/knuppMetric.C | 62 +- .../knuppMetric/knuppMetric.H | 20 +- .../meshUntangler/meshUntangler.C | 92 +- .../meshUntangler/meshUntangler.H | 160 +- .../meshUntangler/meshUntanglerCutRegion.C | 418 ++-- .../meshUntanglerCutRegionEdges.C | 140 +- .../meshUntanglerCutRegionFaces.C | 334 +-- .../meshUntanglerCutRegionPoints.C | 270 +-- .../meshUntanglerCutRegionTieBreak.C | 294 +-- .../simplexSmoother/simplexSmoother.H | 52 +- .../volumeOptimizer/volumeOptimizer.C | 86 +- .../volumeOptimizer/volumeOptimizer.H | 44 +- .../volumeOptimizerEvaluateGradients.C | 248 +- .../tetMeshOptimisation/tetMeshOptimisation.H | 2 +- .../tetMeshOptimisationParallel.C | 36 +- .../surfaceOptimizer/surfaceOptimizer.C | 292 +-- .../surfaceOptimizer/surfaceOptimizer.H | 10 +- .../meshSurfaceOptimizer.C | 20 +- .../meshSurfaceOptimizer.H | 120 +- ...OptimizerCalculateTrianglesAndAddressing.C | 56 +- .../meshSurfaceOptimizerI.H | 422 ++-- .../meshSurfaceOptimizerOptimizePoint.C | 80 +- ...eshSurfaceOptimizerOptimizePointParallel.C | 156 +- .../meshSurfaceOptimizerOptimizeSurface.C | 154 +- .../checkBoundaryFacesSharingTwoEdges.H | 4 +- .../checkCellConnectionsOverFaces.C | 12 +- .../checkCellConnectionsOverFaces.H | 12 +- .../checkIrregularSurfaceConnections.H | 8 +- ...heckIrregularSurfaceConnectionsFunctions.C | 10 +- .../checkNonMappableCellConnections.H | 4 +- .../topologicalCleaner/topologicalCleaner.H | 44 +- .../topologyCleanerNonMappableCells.C | 178 +- .../boundaryFacesGenerator.C | 158 +- .../boundaryFacesGenerator.H | 114 +- ...oundaryFacesGeneratorCreateBoundaryFaces.C | 342 +-- .../boundaryFacesGeneratorFacesForChain.C | 290 +-- .../boundaryOutwardOrientation.C | 54 +- .../boundaryOutwardOrientation.H | 10 +- .../correctEdgesBetweenPatches.C | 42 +- .../correctEdgesBetweenPatches.H | 48 +- .../decomposeCellsNearConcaveEdges.C | 16 +- .../decomposeCellsNearConcaveEdges.H | 20 +- .../decomposeCellsNearConcaveEdgesDecompose.C | 130 +- .../meshSurfaceCheckInvertedVertices.C | 4 +- .../meshSurfaceCutter/meshSurfaceCutter.C | 32 +- .../meshSurfaceCutter/meshSurfaceCutter.H | 46 +- .../meshSurfaceCutterBoundaryFaces.C | 38 +- .../meshSurfaceCutterCreateEdges.C | 6 +- .../meshSurfaceCutterEdgePoints.C | 38 +- .../meshSurfaceCutterFaceCutter.C | 16 +- .../meshSurfaceCutterFaceDirections.C | 82 +- .../meshSurfaceCutterInternalFaces.C | 150 +- .../meshSurfaceEdgeCreateBoundaryFaces.C | 20 +- .../meshSurfaceEdgeCreateEdgeVertices.C | 208 +- .../meshSurfaceEdgeExtractor.C | 92 +- .../meshSurfaceEdgeExtractor.H | 32 +- .../meshSurfaceEdgeExtractorNonTopo.C | 16 +- .../meshSurfaceEdgeExtractorNonTopo.H | 24 +- ...rfaceEdgeExtractorNonTopoDistributeFaces.C | 98 +- .../meshSurfaceEngine/meshSurfaceEngine.C | 58 +- .../meshSurfaceEngine/meshSurfaceEngine.H | 62 +- ...faceEngineCalculateBoundaryNodesAndFaces.C | 134 +- .../meshSurfaceEngineModifier.C | 120 +- .../meshSurfaceEngineModifier.H | 20 +- .../meshSurfaceEngineParallelAddressing.C | 42 +- .../meshSurfaceMapperCornersAndEdges.C | 2 +- .../meshSurfaceMapperMapVertices.C | 26 +- .../meshSurfacePartitioner.C | 2 +- .../meshSurfacePartitioner.H | 4 +- .../renameBoundaryPatches.C | 76 +- .../renameBoundaryPatches.H | 16 +- .../surfaceMorpherCells/surfaceMorpherCells.C | 210 +- .../surfaceMorpherCells/surfaceMorpherCells.H | 70 +- .../surfaceMorpherCellsCreateBoundaryFaces.C | 362 +-- .../surfaceMorpherCellsMorphInternalFaces.C | 2 +- .../triangulateNonPlanarBoundaryFaces.C | 84 +- .../triangulateNonPlanarBoundaryFaces.H | 8 +- .../tetrahedra/delaunayTessellation.tgz | Bin 22699 -> 23032 bytes .../tetCreatorOctree/tetCreatorOctree.C | 224 +- .../tetCreatorOctree/tetCreatorOctree.H | 164 +- .../tetCreatorOctreeFromFacesWithCentreNode.C | 66 +- .../tetCreatorOctree/tetCreatorOctreeI.H | 22 +- .../tetCreatorOctreePointsAndAddressing.C | 466 ++-- .../tetCreatorOctreeTetsAroundEdges.C | 294 +-- .../tetCreatorOctreeTetsAroundSplitEdges.C | 626 ++--- .../tetCreatorOctreeTetsFromSplitFaces.C | 64 +- .../tetPointsCreator/tetPointsCreator.C | 6 +- .../tetPointsCreator/tetPointsCreator.H | 28 +- .../tetPointsCreatorAddPoints.C | 128 +- .../delaunayTessellation.H | 36 +- .../delaunayTessellationFunctions.C | 194 +- .../subdivisionTessellation.H | 60 +- .../subdivisionTessellationFunctions.C | 468 ++-- .../tetTessellation/tessellationElement.C | 28 +- .../tetTessellation/tessellationElement.H | 60 +- .../tetTessellation/tessellationElementI.H | 64 +- .../tetTessellation/tetTessellation.C | 190 +- .../tetTessellation/tetTessellation.H | 68 +- .../tetTessellationFunctions.C | 24 +- .../tetTessellation/tetTessellationNewElmts.C | 280 +-- .../triSurfaceCleanupDuplicates.H | 2 +- .../triSurfaceCurvatureEstimator.H | 2 +- .../triSurfaceDetectMaterials.C | 4 +- .../triSurfaceDetectMaterials.H | 10 +- .../triSurfacePartitioner.C | 18 +- .../triSurfacePartitioner.H | 50 +- .../triSurfacePartitionerCreateAddressing.C | 80 +- .../voronoiMeshExtractor.C | 54 +- .../voronoiMeshExtractor.H | 64 +- .../voronoiMeshExtractorAddressing.C | 316 +-- .../voronoiMeshExtractorCreateMesh.C | 186 +- .../testBoundaryLayer/testBoundaryLayer.C | 78 +- .../testCartesianMeshExtractor.C | 36 +- .../testCellSurfaceIntersections.C | 20 +- .../testChainFromEdges/testChainFromEdges.C | 38 +- .../testConcaveCellUnfolder.C | 84 +- testingInterfaces/testDelaunay/testDelaunay.C | 40 +- .../testDualMeshExtractor.C | 44 +- .../testDynListHP/testDynListHP.C | 54 +- .../testFacesFromChain/testFacesFromChain.C | 94 +- testingInterfaces/testGraph/testGraph.C | 4 +- .../testMaterialDetector.C | 12 +- .../testParallelMesh/testParallelMesh.C | 10 +- .../testRenumberMesh/testRenumberMesh.C | 74 +- .../testSurfaceEdgeExtractor.C | 68 +- .../testSurfaceMorpher/testSurfaceMorpher.C | 8 +- .../testSurfaceSmoothing.C | 56 +- .../testVoronoiMeshExtractor.C | 38 +- tutorials/FanOctree/system/meshDict | 60 +- tutorials/asmoOctree/system/meshDict | 8 +- tutorials/bunnyOctree/system/meshDict | 52 +- tutorials/cutCubeOctree/system/meshDict | 2 +- tutorials/intakePortOctree/system/meshDict | 18 +- tutorials/sBendOctree/system/meshDict | 6 +- tutorials/sawOctree/system/meshDict | 6 +- tutorials/socketOctree/system/meshDict | 6 +- utilities/FLMAToSurface/FLMAToSurface.C | 232 +- utilities/FPMAToMesh/FPMAToMesh.C | 184 +- utilities/FPMAToMesh/Make/options | 4 +- .../cellSetIntersectedByPlane.C | 136 +- utilities/meshToFPMA/Make/options | 4 +- utilities/meshToFPMA/meshToFPMA.C | 10 +- utilities/patchesToSubsets/patchesToSubsets.C | 20 +- utilities/plyToSurface/Make/options | 2 +- utilities/plyToSurface/plyToSurface.C | 100 +- utilities/preparePar/preparePar.C | 64 +- utilities/printCellsInSet/printCellsInSet.C | 42 +- utilities/starSurfaceToSTL/Make/options | 2 +- utilities/starSurfaceToSTL/starSurfaceToSTL.C | 2 +- utilities/subsetToPatch/subsetToPatch.C | 16 +- utilities/surfaceClosedness/Make/options | 2 +- .../surfaceClosedness/surfaceClosedness.C | 2 +- utilities/surfaceFeatureEdges/Make/options | 4 +- .../surfaceFeatureEdges/surfaceFeatureEdges.C | 6 +- .../surfaceGenerateBoundingBox/Make/options | 4 +- .../surfaceGenerateBoundingBox.C | 2 +- .../surfaceOutwardOrientation/Make/options | 4 +- .../surfaceOutwardOrientation.C | 2 +- utilities/surfaceRefine/Make/options | 2 +- utilities/surfaceRefine/surfaceRefine.C | 2 +- utilities/surfaceStitch/Make/options | 2 +- utilities/surfaceStitch/surfaceStitch.C | 204 +- 391 files changed, 25375 insertions(+), 25375 deletions(-) diff --git a/GUI/GTK/generalPage/generalpage.glade b/GUI/GTK/generalPage/generalpage.glade index 070e41f..8e60bee 100644 --- a/GUI/GTK/generalPage/generalpage.glade +++ b/GUI/GTK/generalPage/generalpage.glade @@ -33,435 +33,435 @@ 0 - - True - False - 0 + + True + False + 0 - - - True - False - 0 + + + True + False + 0 - - - True - Surface file - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + Surface file + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 96 - 0 + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 96 + 0 - - - True - True - True - True - 0 - - True - ● - False - - - - - - 0 - True - True - - + + + True + True + True + True + 0 + + True + ● + False + + + + + + 0 + True + True + + - - - True - True - GTK_RELIEF_NORMAL - True + + + True + True + GTK_RELIEF_NORMAL + True - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - True - True - - + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 0 + True + True + + - - - True - False - 0 + + + True + False + 0 - - - True - Max cell size [m] - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + Max cell size [m] + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 54 - 0 + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 54 + 0 - - - True - True - True - True - 0 - - True - ● - False - - - - - 0 - True - True - - - - - 0 - True - True - - + + + True + True + True + True + 0 + + True + ● + False + + + + + 0 + True + True + + + + + 0 + True + True + + - - - True - True - Use different size for boundary cells - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 0 - False - False - - + + + True + True + Use different size for boundary cells + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + False + + - - - True - False - 0 + + + True + False + 0 - - - True - Boundary cell size [m] - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + Boundary cell size [m] + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 10 - 0 + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 10 + 0 - - - True - True - True - True - 0 - - True - ● - False - - - - - 0 - True - True - - - - - 0 - True - True - - + + + True + True + True + True + 0 + + True + ● + False + + + + + 0 + True + True + + + + + 0 + True + True + + - - - True - - - 0 - True - True - - + + + True + + + 0 + True + True + + - - - True - False - 0 + + + True + False + 0 - - - True - True - Use automatic refinement - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - + + + True + True + Use automatic refinement + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + - - - True - False - 0 + + + True + False + 0 - - - True - Min cell size [m] - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + Min cell size [m] + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 61 - 0 + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 61 + 0 - - - True - True - True - True - 0 - - True - ● - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - + + + True + True + True + True + 0 + + True + ● + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + - - - True - - - 0 - True - True - - + + + True + + + 0 + True + True + + - - - True - True - Keep octree boxes intersecting the boundary - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - + + + True + True + Keep octree boxes intersecting the boundary + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + - - - True - True - Remove invalid mesh connections - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - + + + True + True + Remove invalid mesh connections + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + diff --git a/GUI/GTK/keepCellsIntersectingPatches/keepcellsintersectingpatches.glade b/GUI/GTK/keepCellsIntersectingPatches/keepcellsintersectingpatches.glade index 34abf26..bbc0eb1 100644 --- a/GUI/GTK/keepCellsIntersectingPatches/keepcellsintersectingpatches.glade +++ b/GUI/GTK/keepCellsIntersectingPatches/keepcellsintersectingpatches.glade @@ -29,254 +29,254 @@ 0 - - True - Available patches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - + + True + Available patches + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + - - True - False - True - True - - - 1 - 2 - 0 - 1 - fill - + + True + False + True + True + + + 1 + 2 + 0 + 1 + fill + - - True - True - GTK_RELIEF_NORMAL - True + + True + True + GTK_RELIEF_NORMAL + True - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - - - True - False - 2 + + + True + False + 2 - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - Add - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 2 - 3 - 0 - 1 - fill - - + + + True + Add + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 0 + 1 + fill + + - - True - Selected patches - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - + + True + Selected patches + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + - - True - False - True - True - - - 1 - 2 - 1 - 2 - fill - fill - + + True + False + True + True + + + 1 + 2 + 1 + 2 + fill + fill + - - True - True - GTK_RELIEF_NORMAL - True + + True + True + GTK_RELIEF_NORMAL + True - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - - - True - False - 2 + + + True + False + 2 - - - True - gtk-remove - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - Remove - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 2 - 3 - 1 - 2 - fill - - + + + True + Remove + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 1 + 2 + fill + + diff --git a/GUI/GTK/localRefinement/localrefinement.glade b/GUI/GTK/localRefinement/localrefinement.glade index 66c70dd..7a7556c 100644 --- a/GUI/GTK/localRefinement/localrefinement.glade +++ b/GUI/GTK/localRefinement/localrefinement.glade @@ -33,343 +33,343 @@ 0 - - True - False - 0 - - - - True - False - 0 - - - - True - Available patches - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - True - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Add - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 1 - 1 - 10 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - False - 0 - - - - True - Selected patches - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - - 0 - True - True - - - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-remove - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Remove - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - - - - - - - - 0 - True - True - - - - - - - 0 - True - True - - - + + True + False + 0 + + + + True + False + 0 + + + + True + Available patches + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + True + True + + + 0 + True + True + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Add + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 1 + 1 + 10 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + False + 0 + + + + True + Selected patches + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + + + 0 + True + True + + + + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + False + False + False + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Remove + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + + + + + + + + 0 + True + True + + + + + + + 0 + True + True + + + @@ -401,108 +401,108 @@ 0 - - True - Selected patch - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - + + True + Selected patch + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + - - True - Cell size [m] - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - + + True + Cell size [m] + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + - - True - True - True - True - 0 - - True - ● - False - - - 1 - 2 - 1 - 2 - - + + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 1 + 2 + + - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + diff --git a/GUI/GTK/localSettingsMainWindow/localsettingsmainwindow.glade b/GUI/GTK/localSettingsMainWindow/localsettingsmainwindow.glade index 8178135..f46f493 100644 --- a/GUI/GTK/localSettingsMainWindow/localsettingsmainwindow.glade +++ b/GUI/GTK/localSettingsMainWindow/localsettingsmainwindow.glade @@ -30,57 +30,57 @@ False - + - - True - Local refinement - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - + + True + Local refinement + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + - + - - True - Keep octree boxes intersecting patches - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - + + True + Keep octree boxes intersecting patches + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + diff --git a/GUI/GTK/mainWindow/mainwindow.glade b/GUI/GTK/mainWindow/mainwindow.glade index 8600fad..9a8b3bc 100644 --- a/GUI/GTK/mainWindow/mainwindow.glade +++ b/GUI/GTK/mainWindow/mainwindow.glade @@ -26,137 +26,137 @@ 0 - - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_ICONS - True - True + + True + GTK_ORIENTATION_HORIZONTAL + GTK_TOOLBAR_ICONS + True + True - - - True - True - True - False + + + True + True + True + False - - - True - True - Save meshDict - True - GTK_RELIEF_NORMAL - True - - - - - False - False - - + + + True + True + Save meshDict + True + GTK_RELIEF_NORMAL + True + + + + + False + False + + - - - True - True - True - False + + + True + True + True + False - - - True - True - Exit - True - GTK_RELIEF_NORMAL - True - - - - - False - False - - - - - 0 - False - False - + + + True + True + Exit + True + GTK_RELIEF_NORMAL + True + + + + + False + False + + + + + 0 + False + False + - - True - True - True - True - GTK_POS_TOP - False - False + + True + True + True + True + GTK_POS_TOP + False + False - - - + + + - - - True - General settings - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - + + + True + General settings + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + - - - + + + - - - True - Local settings - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - + + + True + Local settings + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + 0 + True + True + diff --git a/GUI/Make/options b/GUI/Make/options index d053162..bb7c4a8 100644 --- a/GUI/Make/options +++ b/GUI/Make/options @@ -1,34 +1,34 @@ EXE_INC = \ - -g -ggdb -DFULLDEBUG -O0 -Wno-old-style-cast \ + -g -ggdb -DFULLDEBUG -O0 -Wno-old-style-cast \ -I$(FOAM_USER_LIB)/meshGeneration/meshLibrary/lnInclude \ - -I$(FOAM_USER_LIB)/meshGeneration/GUI/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude \ - -I/usr/include/cairo \ - -I/usr/include/freetype2 \ - -I/usr/include/libpng12 \ - -I/opt/gnome/include/gtk-2.0 \ - -I/opt/gnome/lib64/gtk-2.0/include \ - -I/opt/gnome/include/atk-1.0 \ - -I/opt/gnome/include/pango-1.0 \ - -I/opt/gnome/include/glib-2.0 \ - -I/opt/gnome/lib64/glib-2.0/include \ - -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui \ - -I$(QTDIR)/include/QtOpenGL - + -I$(FOAM_USER_LIB)/meshGeneration/GUI/lnInclude \ + -I$(FOAM_SRC)/triSurface/lnInclude \ + -I/usr/include/cairo \ + -I/usr/include/freetype2 \ + -I/usr/include/libpng12 \ + -I/opt/gnome/include/gtk-2.0 \ + -I/opt/gnome/lib64/gtk-2.0/include \ + -I/opt/gnome/include/atk-1.0 \ + -I/opt/gnome/include/pango-1.0 \ + -I/opt/gnome/include/glib-2.0 \ + -I/opt/gnome/lib64/glib-2.0/include \ + -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui \ + -I$(QTDIR)/include/QtOpenGL + MOC = $(QTDIR)/bin/moc EXE_LIBS = \ -lMeshLibrary \ - -ltriSurface \ - -L/opt/gnome/lib64 \ - -lgtk-x11-2.0 \ - -lgdk-x11-2.0 \ - -latk-1.0 \ - -lgdk_pixbuf-2.0 \ - -lpangocairo-1.0 \ - -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl \ - -lglib-2.0 -lfreetype -lz -lfontconfig -lexpat -lglitz \ - -lm -lpng12 -lXrender -lX11 -lpthread -lXau -lXdmcp \ - -L/usr/local/lib -L/usr/X11R6/lib \ - -L$(QTDIR)/lib \ - -lGL -lGLU -lqt-mt + -ltriSurface \ + -L/opt/gnome/lib64 \ + -lgtk-x11-2.0 \ + -lgdk-x11-2.0 \ + -latk-1.0 \ + -lgdk_pixbuf-2.0 \ + -lpangocairo-1.0 \ + -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl \ + -lglib-2.0 -lfreetype -lz -lfontconfig -lexpat -lglitz \ + -lm -lpng12 -lXrender -lX11 -lpthread -lXau -lXdmcp \ + -L/usr/local/lib -L/usr/X11R6/lib \ + -L$(QTDIR)/lib \ + -lGL -lGLU -lqt-mt diff --git a/GUI/meshGenGTK/helpers/gtkHelpers.C b/GUI/meshGenGTK/helpers/gtkHelpers.C index 0f76f15..aefd879 100644 --- a/GUI/meshGenGTK/helpers/gtkHelpers.C +++ b/GUI/meshGenGTK/helpers/gtkHelpers.C @@ -20,44 +20,44 @@ GtkWidget* lookup_widget ( - GtkWidget* widget, - const gchar* widget_name + GtkWidget* widget, + const gchar* widget_name ) { - GtkWidget *parent, *found_widget; + GtkWidget *parent, *found_widget; - for(;;) + for(;;) { - if( GTK_IS_MENU(widget) ) - { - parent = gtk_menu_get_attach_widget(GTK_MENU(widget)); - std::cout << "Here!" << std::endl; - } - else - { - parent = widget->parent; - std::cout << "Parent " << parent << std::endl; - } - if( !parent ) - { - parent = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(widget), - "GladeParentKey" - ); - } - - if( parent == NULL ) - break; - widget = parent; + if( GTK_IS_MENU(widget) ) + { + parent = gtk_menu_get_attach_widget(GTK_MENU(widget)); + std::cout << "Here!" << std::endl; + } + else + { + parent = widget->parent; + std::cout << "Parent " << parent << std::endl; + } + if( !parent ) + { + parent = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(widget), + "GladeParentKey" + ); + } + + if( parent == NULL ) + break; + widget = parent; } - std::cout << "Start " << widget << std::endl; - found_widget = (GtkWidget*)g_object_get_data(G_OBJECT(widget), widget_name); - - if( !found_widget ) - g_warning("Widget not found: %s", widget_name); + std::cout << "Start " << widget << std::endl; + found_widget = (GtkWidget*)g_object_get_data(G_OBJECT(widget), widget_name); + + if( !found_widget ) + g_warning("Widget not found: %s", widget_name); return found_widget; } diff --git a/GUI/meshGenGTK/meshGenGTK.C b/GUI/meshGenGTK/meshGenGTK.C index 1ca337a..4cdb06c 100644 --- a/GUI/meshGenGTK/meshGenGTK.C +++ b/GUI/meshGenGTK/meshGenGTK.C @@ -43,38 +43,38 @@ meshGenGTK::meshGenGTK label argc, char* argv[], const objectRegistry& reg ) : - meshGui_(reg), - generalPageFramePtr_(NULL), - mainWindowPtr_(NULL), - localRefinementFramePtr_(NULL), - keepCellsIntersectingPatchesFramePtr_(NULL), - bndLayersFramePtr_(NULL), - localSettingsMainFramePtr_(NULL), - - boxRefinementFramePtr_(NULL), - lineRefinementFramePtr_(NULL), - coneRefinementFramePtr_(NULL), - sphereRefinementFramePtr_(NULL), - objectRefinementMainFramePtr_(NULL), - - renameBoundaryFramePtr_(NULL) + meshGui_(reg), + generalPageFramePtr_(NULL), + mainWindowPtr_(NULL), + localRefinementFramePtr_(NULL), + keepCellsIntersectingPatchesFramePtr_(NULL), + bndLayersFramePtr_(NULL), + localSettingsMainFramePtr_(NULL), + + boxRefinementFramePtr_(NULL), + lineRefinementFramePtr_(NULL), + coneRefinementFramePtr_(NULL), + sphereRefinementFramePtr_(NULL), + objectRefinementMainFramePtr_(NULL), + + renameBoundaryFramePtr_(NULL) { - gtk_init(&argc, &argv); - - createLocalSettingsMainWindowPage(); - createGeneralPage(); - createObjectRefinementMainWindowPage(); - createRenameBoundaryMainWindowPage(); - createMainWindowPage(); - - gtk_main(); + gtk_init(&argc, &argv); + + createLocalSettingsMainWindowPage(); + createGeneralPage(); + createObjectRefinementMainWindowPage(); + createRenameBoundaryMainWindowPage(); + createMainWindowPage(); + + gtk_main(); } // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // meshGenGTK::~meshGenGTK() { - meshGui_.writeDict(); + meshGui_.writeDict(); gtk_main_quit(); } diff --git a/GUI/meshGenGTK/meshGenGTK.H b/GUI/meshGenGTK/meshGenGTK.H index 505108f..c5340fc 100644 --- a/GUI/meshGenGTK/meshGenGTK.H +++ b/GUI/meshGenGTK/meshGenGTK.H @@ -47,7 +47,7 @@ namespace Foam //- Forward declarations class triSurface; - + static meshGenGUI* guiPtr(NULL); /*---------------------------------------------------------------------------*\ @@ -56,49 +56,49 @@ static meshGenGUI* guiPtr(NULL); class meshGenGTK { - // Private data - - //- mesh generation dictionary - meshGenGUI meshGui_; + // Private data + + //- mesh generation dictionary + meshGenGUI meshGui_; - //- pages - GtkWidget* generalPageFramePtr_; - GtkWidget* mainWindowPtr_; - GtkWidget* localRefinementFramePtr_; - GtkWidget* keepCellsIntersectingPatchesFramePtr_; - GtkWidget* bndLayersFramePtr_; - GtkWidget* localSettingsMainFramePtr_; - - GtkWidget* boxRefinementFramePtr_; - GtkWidget* lineRefinementFramePtr_; - GtkWidget* coneRefinementFramePtr_; - GtkWidget* sphereRefinementFramePtr_; - GtkWidget* objectRefinementMainFramePtr_; - - GtkWidget* renameBoundaryFramePtr_; + //- pages + GtkWidget* generalPageFramePtr_; + GtkWidget* mainWindowPtr_; + GtkWidget* localRefinementFramePtr_; + GtkWidget* keepCellsIntersectingPatchesFramePtr_; + GtkWidget* bndLayersFramePtr_; + GtkWidget* localSettingsMainFramePtr_; + + GtkWidget* boxRefinementFramePtr_; + GtkWidget* lineRefinementFramePtr_; + GtkWidget* coneRefinementFramePtr_; + GtkWidget* sphereRefinementFramePtr_; + GtkWidget* objectRefinementMainFramePtr_; + + GtkWidget* renameBoundaryFramePtr_; private: - - // Private member functions - //- create pages - void createGeneralPage(); - void createMainWindowPage(); - - //- pages for local features - void createLocalRefinementWindowPage(); - void createKeepCellsIntersectingPatchesWindowPage(); - void createBndLayersWindowPage(); - void createLocalSettingsMainWindowPage(); - - //- pages for object refinement - void createBoxRefinementWindowPage(); - void createLineRefinementWindowPage(); - void createConeRefinementWindowPage(); - void createSphereRefinementWindowPage(); - void createObjectRefinementMainWindowPage(); - - //- pages for boundary renaming - void createRenameBoundaryMainWindowPage(); + + // Private member functions + //- create pages + void createGeneralPage(); + void createMainWindowPage(); + + //- pages for local features + void createLocalRefinementWindowPage(); + void createKeepCellsIntersectingPatchesWindowPage(); + void createBndLayersWindowPage(); + void createLocalSettingsMainWindowPage(); + + //- pages for object refinement + void createBoxRefinementWindowPage(); + void createLineRefinementWindowPage(); + void createConeRefinementWindowPage(); + void createSphereRefinementWindowPage(); + void createObjectRefinementMainWindowPage(); + + //- pages for boundary renaming + void createRenameBoundaryMainWindowPage(); //- Disallow default bitwise copy construct meshGenGTK(const meshGenGTK&); diff --git a/GUI/meshGenGTK/meshGenGTKBndLayers.C b/GUI/meshGenGTK/meshGenGTKBndLayers.C index 44a383e..9ca79f6 100644 --- a/GUI/meshGenGTK/meshGenGTKBndLayers.C +++ b/GUI/meshGenGTK/meshGenGTKBndLayers.C @@ -37,381 +37,381 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // //- callback functions - + extern "C" { - + static void updateBndLayers(GtkWidget* bndLayersFramePtr) { - GtkWidget* comboboxentry_bndLayers_availablePatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(bndLayersFramePtr), - "comboboxentry_bndLayers_availablePatches" - ); - GtkWidget* comboboxentry_bndLayers_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(bndLayersFramePtr), - "comboboxentry_bndLayers_selectedPatches" - ); - - //- update available patches - wordList alreadyUsed = guiPtr->keepBndLayersPatches(); - wordHashSet usedNames; - forAll(alreadyUsed, nameI) - usedNames.insert(alreadyUsed[nameI]); - - GList* avPatches = 0; - label nAvailable(0); - const triSurface& surf = guiPtr->surface(); - forAll(surf.patches(), patchI) - { - if( usedNames.found(surf.patches()[patchI].name()) ) - continue; - const char* name = surf.patches()[patchI].name().c_str(); - avPatches = g_list_append(avPatches, const_cast(name)); - ++nAvailable; - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_bndLayers_availablePatches - ), avPatches - ); - - if( nAvailable == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_bndLayers_availablePatches - )->entry - ), "" - ); - } - - //- update used patches - GList* selPatches = 0; - forAll(alreadyUsed, patchI) - { - const char* name = alreadyUsed[patchI].c_str(); - selPatches = g_list_append(selPatches, const_cast(name)); - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_bndLayers_selectedPatches - ), selPatches - ); - - if( alreadyUsed.size() == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_bndLayers_selectedPatches - )->entry - ), "" - ); - } - - g_list_free(avPatches); - g_list_free(selPatches); + GtkWidget* comboboxentry_bndLayers_availablePatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(bndLayersFramePtr), + "comboboxentry_bndLayers_availablePatches" + ); + GtkWidget* comboboxentry_bndLayers_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(bndLayersFramePtr), + "comboboxentry_bndLayers_selectedPatches" + ); + + //- update available patches + wordList alreadyUsed = guiPtr->keepBndLayersPatches(); + wordHashSet usedNames; + forAll(alreadyUsed, nameI) + usedNames.insert(alreadyUsed[nameI]); + + GList* avPatches = 0; + label nAvailable(0); + const triSurface& surf = guiPtr->surface(); + forAll(surf.patches(), patchI) + { + if( usedNames.found(surf.patches()[patchI].name()) ) + continue; + const char* name = surf.patches()[patchI].name().c_str(); + avPatches = g_list_append(avPatches, const_cast(name)); + ++nAvailable; + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_bndLayers_availablePatches + ), avPatches + ); + + if( nAvailable == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_bndLayers_availablePatches + )->entry + ), "" + ); + } + + //- update used patches + GList* selPatches = 0; + forAll(alreadyUsed, patchI) + { + const char* name = alreadyUsed[patchI].c_str(); + selPatches = g_list_append(selPatches, const_cast(name)); + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_bndLayers_selectedPatches + ), selPatches + ); + + if( alreadyUsed.size() == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_bndLayers_selectedPatches + )->entry + ), "" + ); + } + + g_list_free(avPatches); + g_list_free(selPatches); } - + static void addBndLayersPatches(GtkWidget* widget, GtkWidget* bndLayersFramePtr) { - GtkWidget* comboboxentry_bndLayers_availablePatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(bndLayersFramePtr), - "comboboxentry_bndLayers_availablePatches" - ); - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_bndLayers_availablePatches - )->entry - ) - ); - - if( name == "" ) - return; - - guiPtr->addBndLayersPatches(name); - - updateBndLayers(bndLayersFramePtr); + GtkWidget* comboboxentry_bndLayers_availablePatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(bndLayersFramePtr), + "comboboxentry_bndLayers_availablePatches" + ); + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_bndLayers_availablePatches + )->entry + ) + ); + + if( name == "" ) + return; + + guiPtr->addBndLayersPatches(name); + + updateBndLayers(bndLayersFramePtr); } static void removeBndLayersPatches ( - GtkWidget* widget, - GtkWidget* bndLayersFramePtr + GtkWidget* widget, + GtkWidget* bndLayersFramePtr ) { - GtkWidget* comboboxentry_bndLayers_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(bndLayersFramePtr), - "comboboxentry_bndLayers_selectedPatches" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_bndLayers_selectedPatches - )->entry - ) - ); - - if( name == "" ) - return; - - guiPtr->removeBndLayersPatches(name); - - updateBndLayers(bndLayersFramePtr); + GtkWidget* comboboxentry_bndLayers_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(bndLayersFramePtr), + "comboboxentry_bndLayers_selectedPatches" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_bndLayers_selectedPatches + )->entry + ) + ); + + if( name == "" ) + return; + + guiPtr->removeBndLayersPatches(name); + + updateBndLayers(bndLayersFramePtr); } } void meshGenGTK::createBndLayersWindowPage() { - guiPtr = &meshGui_; - - bndLayersFramePtr_ = gtk_frame_new(NULL); + guiPtr = &meshGui_; + + bndLayersFramePtr_ = gtk_frame_new(NULL); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a table - GtkWidget* table1 = gtk_table_new(2, 3, FALSE); - gtk_widget_show(table1); - gtk_container_add - ( - GTK_CONTAINER(bndLayersFramePtr_), - table1 - ); + //- create a table + GtkWidget* table1 = gtk_table_new(2, 3, FALSE); + gtk_widget_show(table1); + gtk_container_add + ( + GTK_CONTAINER(bndLayersFramePtr_), + table1 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set label for available patches - GtkWidget* label_bndLayers_availablePatches = - gtk_label_new("Available patches"); - gtk_widget_show(label_bndLayers_availablePatches); - gtk_table_attach - ( - GTK_TABLE(table1), - label_bndLayers_availablePatches, - 0, 1, 0, 1, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0 - ); - gtk_misc_set_alignment - ( - GTK_MISC(label_bndLayers_availablePatches), - 0, - 0.5 - ); - + //- set label for available patches + GtkWidget* label_bndLayers_availablePatches = + gtk_label_new("Available patches"); + gtk_widget_show(label_bndLayers_availablePatches); + gtk_table_attach + ( + GTK_TABLE(table1), + label_bndLayers_availablePatches, + 0, 1, 0, 1, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions) (0), 0, 0 + ); + gtk_misc_set_alignment + ( + GTK_MISC(label_bndLayers_availablePatches), + 0, + 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create the combo box for available patches - GtkWidget* comboboxentry_bndLayers_availablePatches = - gtk_combo_new(); - gtk_widget_show - ( - comboboxentry_bndLayers_availablePatches - ); - gtk_table_attach - ( - GTK_TABLE(table1), - comboboxentry_bndLayers_availablePatches, - 1, 2, 0, 1, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), - (GtkAttachOptions)(GTK_FILL), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO(comboboxentry_bndLayers_availablePatches)->entry - ), - 0 - ); - + //- create the combo box for available patches + GtkWidget* comboboxentry_bndLayers_availablePatches = + gtk_combo_new(); + gtk_widget_show + ( + comboboxentry_bndLayers_availablePatches + ); + gtk_table_attach + ( + GTK_TABLE(table1), + comboboxentry_bndLayers_availablePatches, + 1, 2, 0, 1, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(GTK_FILL), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO(comboboxentry_bndLayers_availablePatches)->entry + ), + 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for adding patches - GtkWidget* button1 = gtk_button_new(); - gtk_widget_show(button1); - gtk_table_attach - ( - GTK_TABLE(table1), - button1, - 2, 3, 0, 1, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - - g_signal_connect - ( - G_OBJECT(button1), - "clicked", - G_CALLBACK(addBndLayersPatches), - bndLayersFramePtr_ - ); + //- set the button for adding patches + GtkWidget* button1 = gtk_button_new(); + gtk_widget_show(button1); + gtk_table_attach + ( + GTK_TABLE(table1), + button1, + 2, 3, 0, 1, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + + g_signal_connect + ( + G_OBJECT(button1), + "clicked", + G_CALLBACK(addBndLayersPatches), + bndLayersFramePtr_ + ); - GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(button1), alignment1); - - GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox1); - gtk_container_add(GTK_CONTAINER(alignment1), hbox1); - - GtkWidget* image1 = - gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); - - GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); - gtk_widget_show(label3); - gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); - + GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(button1), alignment1); + + GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox1); + gtk_container_add(GTK_CONTAINER(alignment1), hbox1); + + GtkWidget* image1 = + gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); + + GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); + gtk_widget_show(label3); + gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set label for selected patches - GtkWidget* label_bndLayers_selectedPatches = - gtk_label_new("Selected patches"); - gtk_widget_show(label_bndLayers_selectedPatches); - gtk_table_attach - ( - GTK_TABLE(table1), - label_bndLayers_selectedPatches, - 0, 1, 1, 2, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - gtk_misc_set_alignment - ( - GTK_MISC(label_bndLayers_selectedPatches), - 0, - 0.5 - ); - + //- set label for selected patches + GtkWidget* label_bndLayers_selectedPatches = + gtk_label_new("Selected patches"); + gtk_widget_show(label_bndLayers_selectedPatches); + gtk_table_attach + ( + GTK_TABLE(table1), + label_bndLayers_selectedPatches, + 0, 1, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + gtk_misc_set_alignment + ( + GTK_MISC(label_bndLayers_selectedPatches), + 0, + 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create the combo box for selected patches - GtkWidget* comboboxentry_bndLayers_selectedPatches = - gtk_combo_new(); - gtk_widget_show(comboboxentry_bndLayers_selectedPatches); - gtk_table_attach - ( - GTK_TABLE(table1), - comboboxentry_bndLayers_selectedPatches, - 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO(comboboxentry_bndLayers_selectedPatches)->entry - ), - 0 - ); - + //- create the combo box for selected patches + GtkWidget* comboboxentry_bndLayers_selectedPatches = + gtk_combo_new(); + gtk_widget_show(comboboxentry_bndLayers_selectedPatches); + gtk_table_attach + ( + GTK_TABLE(table1), + comboboxentry_bndLayers_selectedPatches, + 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO(comboboxentry_bndLayers_selectedPatches)->entry + ), + 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for removing patches - GtkWidget* button2 = gtk_button_new(); - gtk_widget_show(button2); - gtk_table_attach - ( - GTK_TABLE(table1), - button2, - 2, 3, 1, 2, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - - g_signal_connect - ( - G_OBJECT(button2), - "clicked", - G_CALLBACK(removeBndLayersPatches), - bndLayersFramePtr_ - ); - - GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment2); - gtk_container_add(GTK_CONTAINER(button2), alignment2); - - GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox2); - gtk_container_add(GTK_CONTAINER(alignment2), hbox2); - - GtkWidget* image2 = - gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image2); - gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); - - GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); - + //- set the button for removing patches + GtkWidget* button2 = gtk_button_new(); + gtk_widget_show(button2); + gtk_table_attach + ( + GTK_TABLE(table1), + button2, + 2, 3, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + + g_signal_connect + ( + G_OBJECT(button2), + "clicked", + G_CALLBACK(removeBndLayersPatches), + bndLayersFramePtr_ + ); + + GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment2); + gtk_container_add(GTK_CONTAINER(button2), alignment2); + + GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox2); + gtk_container_add(GTK_CONTAINER(alignment2), hbox2); + + GtkWidget* image2 = + gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image2); + gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); + + GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); + gtk_widget_show(label5); + gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - bndLayersFramePtr_, - bndLayersFramePtr_, - "Cell intersecting patches frame" - ); - GLADE_HOOKUP_OBJECT - ( - bndLayersFramePtr_, - comboboxentry_bndLayers_availablePatches, - "comboboxentry_bndLayers_availablePatches" - ); - GLADE_HOOKUP_OBJECT - ( - bndLayersFramePtr_, - button1, - "button1" - ); - GLADE_HOOKUP_OBJECT - ( - bndLayersFramePtr_, - label_bndLayers_selectedPatches, - "label_bndLayers_selectedPatches" - ); - GLADE_HOOKUP_OBJECT - ( - bndLayersFramePtr_, - comboboxentry_bndLayers_selectedPatches, - "comboboxentry_bndLayers_selectedPatches" - ); - GLADE_HOOKUP_OBJECT - ( - bndLayersFramePtr_, - button2, - "button2" - ); - - updateBndLayers(bndLayersFramePtr_); - - gtk_widget_show(bndLayersFramePtr_); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + bndLayersFramePtr_, + bndLayersFramePtr_, + "Cell intersecting patches frame" + ); + GLADE_HOOKUP_OBJECT + ( + bndLayersFramePtr_, + comboboxentry_bndLayers_availablePatches, + "comboboxentry_bndLayers_availablePatches" + ); + GLADE_HOOKUP_OBJECT + ( + bndLayersFramePtr_, + button1, + "button1" + ); + GLADE_HOOKUP_OBJECT + ( + bndLayersFramePtr_, + label_bndLayers_selectedPatches, + "label_bndLayers_selectedPatches" + ); + GLADE_HOOKUP_OBJECT + ( + bndLayersFramePtr_, + comboboxentry_bndLayers_selectedPatches, + "comboboxentry_bndLayers_selectedPatches" + ); + GLADE_HOOKUP_OBJECT + ( + bndLayersFramePtr_, + button2, + "button2" + ); + + updateBndLayers(bndLayersFramePtr_); + + gtk_widget_show(bndLayersFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKBoxRefinement.C b/GUI/meshGenGTK/meshGenGTKBoxRefinement.C index e9ba591..1fc3806 100644 --- a/GUI/meshGenGTK/meshGenGTKBoxRefinement.C +++ b/GUI/meshGenGTK/meshGenGTKBoxRefinement.C @@ -37,1007 +37,1007 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // //- callback functions - + extern "C" { - + static void showDataForBoxRefinement ( - GtkWidget* widget, - GtkWidget* boxRefinementFramePtr + GtkWidget* widget, + GtkWidget* boxRefinementFramePtr ) { - GtkWidget* comboboxentry_boxRefinement_createdBoxes = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "comboboxentry_boxRefinement_createdBoxes" - ); - GtkWidget* entry_boxRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedCellSize" - ); - GtkWidget* entry_boxRefinement_selectedCentreX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedCentreX" - ); - GtkWidget* entry_boxRefinement_selectedCentreY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedCentreY" - ); - GtkWidget* entry_boxRefinement_selectedCentreZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedCentreZ" - ); - GtkWidget* entry_boxRefinement_selectedLengthX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedLengthX" - ); - GtkWidget* entry_boxRefinement_selectedLengthY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedLengthY" - ); - GtkWidget* entry_boxRefinement_selectedLengthZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedLengthZ" - ); - - //- find the object in the dictionary - const word boxName = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_boxRefinement_createdBoxes)->entry - ) - ); - - const PtrList refs = guiPtr->objectRefinements(); - - forAll(refs, refI) - if( refs[refI].keyword() == boxName ) - { - const dictionary dict = refs[refI].dict(); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_boxRefinement_selectedCellSize), - help::scalarToText - ( - scalar(readScalar(dict.lookup("cellSize"))) - ).c_str() - ); - const vector centre(dict.lookup("centre")); - gtk_entry_set_text - ( - GTK_ENTRY(entry_boxRefinement_selectedCentreX), - help::scalarToText(centre.x()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_boxRefinement_selectedCentreY), - help::scalarToText(centre.y()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_boxRefinement_selectedCentreZ), - help::scalarToText(centre.z()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_boxRefinement_selectedLengthX), - help::scalarToText(readScalar(dict.lookup("lengthX"))).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_boxRefinement_selectedLengthY), - help::scalarToText(readScalar(dict.lookup("lengthY"))).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_boxRefinement_selectedLengthZ), - help::scalarToText(readScalar(dict.lookup("lengthZ"))).c_str() - ); - - return; - } - - gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedCellSize), ""); - gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedCentreX), ""); - gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedCentreY), ""); - gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedCentreZ), ""); - gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedLengthX), ""); - gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedLengthY), ""); - gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedLengthZ), ""); + GtkWidget* comboboxentry_boxRefinement_createdBoxes = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "comboboxentry_boxRefinement_createdBoxes" + ); + GtkWidget* entry_boxRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedCellSize" + ); + GtkWidget* entry_boxRefinement_selectedCentreX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedCentreX" + ); + GtkWidget* entry_boxRefinement_selectedCentreY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedCentreY" + ); + GtkWidget* entry_boxRefinement_selectedCentreZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedCentreZ" + ); + GtkWidget* entry_boxRefinement_selectedLengthX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedLengthX" + ); + GtkWidget* entry_boxRefinement_selectedLengthY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedLengthY" + ); + GtkWidget* entry_boxRefinement_selectedLengthZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedLengthZ" + ); + + //- find the object in the dictionary + const word boxName = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_boxRefinement_createdBoxes)->entry + ) + ); + + const PtrList refs = guiPtr->objectRefinements(); + + forAll(refs, refI) + if( refs[refI].keyword() == boxName ) + { + const dictionary dict = refs[refI].dict(); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_boxRefinement_selectedCellSize), + help::scalarToText + ( + scalar(readScalar(dict.lookup("cellSize"))) + ).c_str() + ); + const vector centre(dict.lookup("centre")); + gtk_entry_set_text + ( + GTK_ENTRY(entry_boxRefinement_selectedCentreX), + help::scalarToText(centre.x()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_boxRefinement_selectedCentreY), + help::scalarToText(centre.y()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_boxRefinement_selectedCentreZ), + help::scalarToText(centre.z()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_boxRefinement_selectedLengthX), + help::scalarToText(readScalar(dict.lookup("lengthX"))).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_boxRefinement_selectedLengthY), + help::scalarToText(readScalar(dict.lookup("lengthY"))).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_boxRefinement_selectedLengthZ), + help::scalarToText(readScalar(dict.lookup("lengthZ"))).c_str() + ); + + return; + } + + gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedCellSize), ""); + gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedCentreX), ""); + gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedCentreY), ""); + gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedCentreZ), ""); + gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedLengthX), ""); + gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedLengthY), ""); + gtk_entry_set_text(GTK_ENTRY(entry_boxRefinement_selectedLengthZ), ""); } static void resetValuesForSelectedBox ( - GtkWidget* widget, - GtkWidget* boxRefinementFramePtr + GtkWidget* widget, + GtkWidget* boxRefinementFramePtr ) { - GtkWidget* comboboxentry_boxRefinement_createdBoxes = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "comboboxentry_boxRefinement_createdBoxes" - ); - GtkWidget* entry_boxRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedCellSize" - ); - GtkWidget* entry_boxRefinement_selectedCentreX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedCentreX" - ); - GtkWidget* entry_boxRefinement_selectedCentreY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedCentreY" - ); - GtkWidget* entry_boxRefinement_selectedCentreZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedCentreZ" - ); - GtkWidget* entry_boxRefinement_selectedLengthX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedLengthX" - ); - GtkWidget* entry_boxRefinement_selectedLengthY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedLengthY" - ); - GtkWidget* entry_boxRefinement_selectedLengthZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_selectedLengthZ" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_boxRefinement_createdBoxes - )->entry - ) - ); - - if( name == "" ) - return; - - const PtrList refs = guiPtr->objectRefinements(); - dictionary dict; - forAll(refs, refI) - if( refs[refI].keyword() == name ) - dict = refs[refI].dict(); - guiPtr->removeObjectRefinement(name); - if( widget == entry_boxRefinement_selectedCellSize ) - { - const word size = - gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedCellSize)); - dict.remove("cellSize"); - dict.add("cellSize", help::textToScalar(size)); - } - else if( widget == entry_boxRefinement_selectedCentreX ) - { - point centre(dict.lookup("centre")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedCentreX)); - dict.remove("centre"); - centre.x() = help::textToScalar(c); - dict.add("centre", centre); - } - else if( widget == entry_boxRefinement_selectedCentreY ) - { - point centre(dict.lookup("centre")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedCentreY)); - dict.remove("centre"); - centre.y() = help::textToScalar(c); - dict.add("centre", centre); - } - else if( widget == entry_boxRefinement_selectedCentreZ ) - { - point centre(dict.lookup("centre")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedCentreZ)); - dict.remove("centre"); - centre.z() = help::textToScalar(c); - dict.add("centre", centre); - } - else if( widget == entry_boxRefinement_selectedLengthX ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedLengthX)); - dict.remove("lengthX"); - dict.add("lengthX", help::textToScalar(l)); - } - else if( widget == entry_boxRefinement_selectedLengthY ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedLengthY)); - dict.remove("lengthY"); - dict.add("lengthY", help::textToScalar(l)); - } - else if( widget == entry_boxRefinement_selectedLengthZ ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedLengthZ)); - dict.remove("lengthZ"); - dict.add("lengthZ", help::textToScalar(l)); - } - - boxRefinement br(name, dict); - guiPtr->addObjectRefinement(br); + GtkWidget* comboboxentry_boxRefinement_createdBoxes = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "comboboxentry_boxRefinement_createdBoxes" + ); + GtkWidget* entry_boxRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedCellSize" + ); + GtkWidget* entry_boxRefinement_selectedCentreX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedCentreX" + ); + GtkWidget* entry_boxRefinement_selectedCentreY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedCentreY" + ); + GtkWidget* entry_boxRefinement_selectedCentreZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedCentreZ" + ); + GtkWidget* entry_boxRefinement_selectedLengthX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedLengthX" + ); + GtkWidget* entry_boxRefinement_selectedLengthY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedLengthY" + ); + GtkWidget* entry_boxRefinement_selectedLengthZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_selectedLengthZ" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_boxRefinement_createdBoxes + )->entry + ) + ); + + if( name == "" ) + return; + + const PtrList refs = guiPtr->objectRefinements(); + dictionary dict; + forAll(refs, refI) + if( refs[refI].keyword() == name ) + dict = refs[refI].dict(); + guiPtr->removeObjectRefinement(name); + if( widget == entry_boxRefinement_selectedCellSize ) + { + const word size = + gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedCellSize)); + dict.remove("cellSize"); + dict.add("cellSize", help::textToScalar(size)); + } + else if( widget == entry_boxRefinement_selectedCentreX ) + { + point centre(dict.lookup("centre")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedCentreX)); + dict.remove("centre"); + centre.x() = help::textToScalar(c); + dict.add("centre", centre); + } + else if( widget == entry_boxRefinement_selectedCentreY ) + { + point centre(dict.lookup("centre")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedCentreY)); + dict.remove("centre"); + centre.y() = help::textToScalar(c); + dict.add("centre", centre); + } + else if( widget == entry_boxRefinement_selectedCentreZ ) + { + point centre(dict.lookup("centre")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedCentreZ)); + dict.remove("centre"); + centre.z() = help::textToScalar(c); + dict.add("centre", centre); + } + else if( widget == entry_boxRefinement_selectedLengthX ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedLengthX)); + dict.remove("lengthX"); + dict.add("lengthX", help::textToScalar(l)); + } + else if( widget == entry_boxRefinement_selectedLengthY ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedLengthY)); + dict.remove("lengthY"); + dict.add("lengthY", help::textToScalar(l)); + } + else if( widget == entry_boxRefinement_selectedLengthZ ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_boxRefinement_selectedLengthZ)); + dict.remove("lengthZ"); + dict.add("lengthZ", help::textToScalar(l)); + } + + boxRefinement br(name, dict); + guiPtr->addObjectRefinement(br); } static void updateBoxRefinements(GtkWidget* boxRefinementFramePtr) { - GtkWidget* comboboxentry_boxRefinement_createdBoxes = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "comboboxentry_boxRefinement_createdBoxes" - ); - - const PtrList refs = guiPtr->objectRefinements(); - label nBoxes(0); - GList* createdBoxes = 0; - forAll(refs, refI) - { - const word& key = refs[refI].keyword(); - const dictionary& dict = refs[refI].dict(); - const word type(dict.lookup("type")); - - if( type == "box" ) - { - ++nBoxes; - boxRefinement br(key, dict); - createdBoxes = - g_list_append - ( - createdBoxes, - const_cast(br.name().c_str()) - ); - } - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_boxRefinement_createdBoxes - ), createdBoxes - ); - - if( nBoxes == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_boxRefinement_createdBoxes)->entry - ), - "" - ); - } - - g_list_free(createdBoxes); - - showDataForBoxRefinement(NULL, boxRefinementFramePtr); + GtkWidget* comboboxentry_boxRefinement_createdBoxes = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "comboboxentry_boxRefinement_createdBoxes" + ); + + const PtrList refs = guiPtr->objectRefinements(); + label nBoxes(0); + GList* createdBoxes = 0; + forAll(refs, refI) + { + const word& key = refs[refI].keyword(); + const dictionary& dict = refs[refI].dict(); + const word type(dict.lookup("type")); + + if( type == "box" ) + { + ++nBoxes; + boxRefinement br(key, dict); + createdBoxes = + g_list_append + ( + createdBoxes, + const_cast(br.name().c_str()) + ); + } + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_boxRefinement_createdBoxes + ), createdBoxes + ); + + if( nBoxes == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_boxRefinement_createdBoxes)->entry + ), + "" + ); + } + + g_list_free(createdBoxes); + + showDataForBoxRefinement(NULL, boxRefinementFramePtr); } static void addBoxRefinement ( - GtkWidget* button, - GtkWidget* boxRefinementFramePtr + GtkWidget* button, + GtkWidget* boxRefinementFramePtr ) { - GtkWidget* name = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxName" - ); - GtkWidget* cellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_cellSize" - ); - GtkWidget* centreX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_centreX" - ); - GtkWidget* centreY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_centreY" - ); - GtkWidget* centreZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_centreZ" - ); - GtkWidget* lengthX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_lengthX" - ); - GtkWidget* lengthY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_lengthY" - ); - GtkWidget* lengthZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "entry_boxRefinement_lengthZ" - ); - - //- create all necessary settings - const word boxName = gtk_entry_get_text(GTK_ENTRY(name)); - gtk_entry_set_text(GTK_ENTRY(name), ""); - const scalar boxCellSize = - help::textToScalar(gtk_entry_get_text(GTK_ENTRY(cellSize))); - gtk_entry_set_text(GTK_ENTRY(cellSize), ""); - point centre; - centre.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreX))); - gtk_entry_set_text(GTK_ENTRY(centreX), ""); - centre.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreY))); - gtk_entry_set_text(GTK_ENTRY(centreY), ""); - centre.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreZ))); - gtk_entry_set_text(GTK_ENTRY(centreZ), ""); - const scalar boxLengthX = - help::textToScalar(gtk_entry_get_text(GTK_ENTRY(lengthX))); - gtk_entry_set_text(GTK_ENTRY(lengthX), ""); - const scalar boxLengthY = - help::textToScalar(gtk_entry_get_text(GTK_ENTRY(lengthY))); - gtk_entry_set_text(GTK_ENTRY(lengthY), ""); - const scalar boxLengthZ = - help::textToScalar(gtk_entry_get_text(GTK_ENTRY(lengthZ))); - gtk_entry_set_text(GTK_ENTRY(lengthZ), ""); - - boxRefinement box - ( - boxName, - boxCellSize, - centre, - boxLengthX, - boxLengthY, - boxLengthZ - ); - - guiPtr->addObjectRefinement(box); - - updateBoxRefinements(boxRefinementFramePtr); + GtkWidget* name = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxName" + ); + GtkWidget* cellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_cellSize" + ); + GtkWidget* centreX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_centreX" + ); + GtkWidget* centreY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_centreY" + ); + GtkWidget* centreZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_centreZ" + ); + GtkWidget* lengthX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_lengthX" + ); + GtkWidget* lengthY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_lengthY" + ); + GtkWidget* lengthZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "entry_boxRefinement_lengthZ" + ); + + //- create all necessary settings + const word boxName = gtk_entry_get_text(GTK_ENTRY(name)); + gtk_entry_set_text(GTK_ENTRY(name), ""); + const scalar boxCellSize = + help::textToScalar(gtk_entry_get_text(GTK_ENTRY(cellSize))); + gtk_entry_set_text(GTK_ENTRY(cellSize), ""); + point centre; + centre.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreX))); + gtk_entry_set_text(GTK_ENTRY(centreX), ""); + centre.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreY))); + gtk_entry_set_text(GTK_ENTRY(centreY), ""); + centre.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreZ))); + gtk_entry_set_text(GTK_ENTRY(centreZ), ""); + const scalar boxLengthX = + help::textToScalar(gtk_entry_get_text(GTK_ENTRY(lengthX))); + gtk_entry_set_text(GTK_ENTRY(lengthX), ""); + const scalar boxLengthY = + help::textToScalar(gtk_entry_get_text(GTK_ENTRY(lengthY))); + gtk_entry_set_text(GTK_ENTRY(lengthY), ""); + const scalar boxLengthZ = + help::textToScalar(gtk_entry_get_text(GTK_ENTRY(lengthZ))); + gtk_entry_set_text(GTK_ENTRY(lengthZ), ""); + + boxRefinement box + ( + boxName, + boxCellSize, + centre, + boxLengthX, + boxLengthY, + boxLengthZ + ); + + guiPtr->addObjectRefinement(box); + + updateBoxRefinements(boxRefinementFramePtr); } static void removeBoxRefinement ( - GtkWidget* button, - GtkWidget* boxRefinementFramePtr + GtkWidget* button, + GtkWidget* boxRefinementFramePtr ) { - GtkWidget* createdBoxes = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(boxRefinementFramePtr), - "comboboxentry_boxRefinement_createdBoxes" - ); - - const word boxName = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(createdBoxes)->entry - ) - ); + GtkWidget* createdBoxes = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(boxRefinementFramePtr), + "comboboxentry_boxRefinement_createdBoxes" + ); + + const word boxName = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(createdBoxes)->entry + ) + ); - guiPtr->removeObjectRefinement(boxName); + guiPtr->removeObjectRefinement(boxName); - updateBoxRefinements(boxRefinementFramePtr); + updateBoxRefinements(boxRefinementFramePtr); } } void meshGenGTK::createBoxRefinementWindowPage() { - guiPtr = &meshGui_; - - boxRefinementFramePtr_ = gtk_frame_new(NULL); + guiPtr = &meshGui_; + + boxRefinementFramePtr_ = gtk_frame_new(NULL); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a table - GtkWidget* table1 = gtk_table_new(5, 11, FALSE); - gtk_widget_show(table1); - gtk_container_add - ( - GTK_CONTAINER(boxRefinementFramePtr_), - table1 - ); + //- create a table + GtkWidget* table1 = gtk_table_new(5, 11, FALSE); + gtk_widget_show(table1); + gtk_container_add + ( + GTK_CONTAINER(boxRefinementFramePtr_), + table1 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for box name - GtkWidget* label_boxName = gtk_label_new("Box name"); - gtk_widget_show(label_boxName); - gtk_table_attach(GTK_TABLE(table1), label_boxName, 0, 1, 0, 1, + //- create a label for box name + GtkWidget* label_boxName = gtk_label_new("Box name"); + gtk_widget_show(label_boxName); + gtk_table_attach(GTK_TABLE(table1), label_boxName, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_boxName), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_boxName), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create an entry for box name - GtkWidget* entry_boxName = gtk_entry_new(); - gtk_widget_show(entry_boxName); - - gtk_table_attach(GTK_TABLE(table1), entry_boxName, 1, 4, 0, 1, - (GtkAttachOptions)(GTK_FILL), + //- create an entry for box name + GtkWidget* entry_boxName = gtk_entry_new(); + gtk_widget_show(entry_boxName); + + gtk_table_attach(GTK_TABLE(table1), entry_boxName, 1, 4, 0, 1, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for desired cell size - GtkWidget* label_boxRefinement_cellSize = gtk_label_new("Cell size [m]"); - gtk_widget_show(label_boxRefinement_cellSize); - gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_cellSize, - 0, 1, 1, 2, - (GtkAttachOptions)(GTK_FILL), + //- create a label for desired cell size + GtkWidget* label_boxRefinement_cellSize = gtk_label_new("Cell size [m]"); + gtk_widget_show(label_boxRefinement_cellSize); + gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_cellSize, + 0, 1, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_boxRefinement_cellSize), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_boxRefinement_cellSize), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for desired cell size - GtkWidget* entry_boxRefinement_cellSize = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_cellSize); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_cellSize, - 1, 4, 1, 2, - (GtkAttachOptions)(GTK_FILL), + //- create a label for desired cell size + GtkWidget* entry_boxRefinement_cellSize = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_cellSize); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_cellSize, + 1, 4, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create labels for axes - GtkWidget* label_axes = gtk_label_new("X"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 1, 2, 2, 3, - (GtkAttachOptions)(GTK_FILL), + //- create labels for axes + GtkWidget* label_axes = gtk_label_new("X"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 1, 2, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Y"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 2, 3, 2, 3, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Y"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 2, 3, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Z"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 3, 4, 2, 3, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Z"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 3, 4, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for box centre - GtkWidget* label_boxRefinement_centre = gtk_label_new("Centre"); - gtk_widget_show(label_boxRefinement_centre); - gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_centre, - 0, 1, 3, 4, - (GtkAttachOptions)(GTK_FILL), + //- label for box centre + GtkWidget* label_boxRefinement_centre = gtk_label_new("Centre"); + gtk_widget_show(label_boxRefinement_centre); + gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_centre, + 0, 1, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_boxRefinement_centre), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_boxRefinement_centre), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for box centre - GtkWidget* entry_boxRefinement_centreX = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_centreX); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_centreX, - 1, 2, 3, 4, - (GtkAttachOptions)(GTK_FILL), + //- entries for box centre + GtkWidget* entry_boxRefinement_centreX = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_centreX); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_centreX, + 1, 2, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_boxRefinement_centreY = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_centreY); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_centreY, - 2, 3, 3, 4, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_boxRefinement_centreY = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_centreY); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_centreY, + 2, 3, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_boxRefinement_centreZ = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_centreZ); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_centreZ, - 3, 4, 3, 4, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_boxRefinement_centreZ = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_centreZ); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_centreZ, + 3, 4, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for side lengths - GtkWidget* label_boxRefinement_lengths = gtk_label_new("Side lengths"); - gtk_widget_show(label_boxRefinement_lengths); - gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_lengths, - 0, 1, 4, 5, - (GtkAttachOptions)(GTK_FILL), + //- label for side lengths + GtkWidget* label_boxRefinement_lengths = gtk_label_new("Side lengths"); + gtk_widget_show(label_boxRefinement_lengths); + gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_lengths, + 0, 1, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_boxRefinement_lengths), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_boxRefinement_lengths), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for side lengths - GtkWidget* entry_boxRefinement_lengthX = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_lengthX); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_lengthX, - 1, 2, 4, 5, - (GtkAttachOptions)(GTK_FILL), + //- entries for side lengths + GtkWidget* entry_boxRefinement_lengthX = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_lengthX); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_lengthX, + 1, 2, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_boxRefinement_lengthY = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_lengthY); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_lengthY, - 2, 3, 4, 5, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_boxRefinement_lengthY = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_lengthY); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_lengthY, + 2, 3, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_boxRefinement_lengthZ = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_lengthZ); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_lengthZ, - 3, 4, 4, 5, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_boxRefinement_lengthZ = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_lengthZ); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_lengthZ, + 3, 4, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for adding boxes - GtkWidget* button1 = gtk_button_new(); - gtk_widget_show(button1); - gtk_table_attach - ( - GTK_TABLE(table1), - button1, - 4, 5, 0, 5, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - g_signal_connect - ( - G_OBJECT(button1), - "clicked", - G_CALLBACK(addBoxRefinement), - boxRefinementFramePtr_ - ); + //- set the button for adding boxes + GtkWidget* button1 = gtk_button_new(); + gtk_widget_show(button1); + gtk_table_attach + ( + GTK_TABLE(table1), + button1, + 4, 5, 0, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + g_signal_connect + ( + G_OBJECT(button1), + "clicked", + G_CALLBACK(addBoxRefinement), + boxRefinementFramePtr_ + ); - GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(button1), alignment1); - - GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox1); - gtk_container_add(GTK_CONTAINER(alignment1), hbox1); - - GtkWidget* image1 = - gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); - - GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); - gtk_widget_show(label3); - gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); - + GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(button1), alignment1); + + GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox1); + gtk_container_add(GTK_CONTAINER(alignment1), hbox1); + + GtkWidget* image1 = + gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); + + GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); + gtk_widget_show(label3); + gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- horizontal separator - GtkWidget* hseparator0 = gtk_hseparator_new(); - gtk_widget_show(hseparator0); - gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 5, 6, + //- horizontal separator + GtkWidget* hseparator0 = gtk_hseparator_new(); + gtk_widget_show(hseparator0); + gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 5, 6, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); + 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for existing box objects - GtkWidget* label_boxRefinement_existing = gtk_label_new("Existing boxes"); - gtk_widget_show(label_boxRefinement_existing); - gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_existing, - 0, 1, 6, 7, - (GtkAttachOptions)(GTK_FILL), + //- label for existing box objects + GtkWidget* label_boxRefinement_existing = gtk_label_new("Existing boxes"); + gtk_widget_show(label_boxRefinement_existing); + gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_existing, + 0, 1, 6, 7, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- combobox for existing box objects - GtkWidget* comboboxentry_boxRefinement_createdBoxes = - gtk_combo_new(); - gtk_widget_show(comboboxentry_boxRefinement_createdBoxes); - gtk_table_attach(GTK_TABLE(table1),comboboxentry_boxRefinement_createdBoxes, - 1, 2, 6, 7, - (GtkAttachOptions)(GTK_FILL), + //- combobox for existing box objects + GtkWidget* comboboxentry_boxRefinement_createdBoxes = + gtk_combo_new(); + gtk_widget_show(comboboxentry_boxRefinement_createdBoxes); + gtk_table_attach(GTK_TABLE(table1),comboboxentry_boxRefinement_createdBoxes, + 1, 2, 6, 7, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO(comboboxentry_boxRefinement_createdBoxes)->entry - ), - 0 - ); - - + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO(comboboxentry_boxRefinement_createdBoxes)->entry + ), + 0 + ); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for selected cell size - GtkWidget* label_boxRefinement_selectedCellSize = - gtk_label_new("Cell size [m]"); - gtk_widget_show(label_boxRefinement_selectedCellSize); - gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_selectedCellSize, - 0, 1, 7, 8, - (GtkAttachOptions)(GTK_FILL), + //- create a label for selected cell size + GtkWidget* label_boxRefinement_selectedCellSize = + gtk_label_new("Cell size [m]"); + gtk_widget_show(label_boxRefinement_selectedCellSize); + gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_selectedCellSize, + 0, 1, 7, 8, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_boxRefinement_selectedCellSize), 0, 0.5 - ); - + gtk_misc_set_alignment + ( + GTK_MISC(label_boxRefinement_selectedCellSize), 0, 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for selected cell size - GtkWidget* entry_boxRefinement_selectedCellSize = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_selectedCellSize); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedCellSize, - 1, 4, 7, 8, - (GtkAttachOptions)(GTK_FILL), + //- create a label for selected cell size + GtkWidget* entry_boxRefinement_selectedCellSize = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_selectedCellSize); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedCellSize, + 1, 4, 7, 8, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create labels for axes - label_axes = gtk_label_new("X"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 1, 2, 8, 9, - (GtkAttachOptions)(GTK_FILL), + //- create labels for axes + label_axes = gtk_label_new("X"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 1, 2, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Y"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 2, 3, 8, 9, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Y"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 2, 3, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Z"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 3, 4, 8, 9, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Z"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 3, 4, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for box centre - GtkWidget* label_boxRefinement_selectedCentre = gtk_label_new("Centre"); - gtk_widget_show(label_boxRefinement_selectedCentre); - gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_selectedCentre, - 0, 1, 9, 10, - (GtkAttachOptions)(GTK_FILL), + //- label for box centre + GtkWidget* label_boxRefinement_selectedCentre = gtk_label_new("Centre"); + gtk_widget_show(label_boxRefinement_selectedCentre); + gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_selectedCentre, + 0, 1, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_boxRefinement_selectedCentre), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_boxRefinement_selectedCentre), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for selected box centre - GtkWidget* entry_boxRefinement_selectedCentreX = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_selectedCentreX); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedCentreX, - 1, 2, 9, 10, - (GtkAttachOptions)(GTK_FILL), + //- entries for selected box centre + GtkWidget* entry_boxRefinement_selectedCentreX = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_selectedCentreX); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedCentreX, + 1, 2, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_boxRefinement_selectedCentreY = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_selectedCentreY); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedCentreY, - 2, 3, 9, 10, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_boxRefinement_selectedCentreY = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_selectedCentreY); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedCentreY, + 2, 3, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_boxRefinement_selectedCentreZ = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_selectedCentreZ); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedCentreZ, - 3, 4, 9, 10, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_boxRefinement_selectedCentreZ = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_selectedCentreZ); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedCentreZ, + 3, 4, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for selected side lengths - GtkWidget* label_boxRefinement_selectedLengths = - gtk_label_new("Side lengths"); - gtk_widget_show(label_boxRefinement_selectedLengths); - gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_selectedLengths, - 0, 1, 10, 11, - (GtkAttachOptions)(GTK_FILL), + //- label for selected side lengths + GtkWidget* label_boxRefinement_selectedLengths = + gtk_label_new("Side lengths"); + gtk_widget_show(label_boxRefinement_selectedLengths); + gtk_table_attach(GTK_TABLE(table1), label_boxRefinement_selectedLengths, + 0, 1, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_boxRefinement_selectedLengths), 0, 0.5 - ); + gtk_misc_set_alignment + ( + GTK_MISC(label_boxRefinement_selectedLengths), 0, 0.5 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for side lengths - GtkWidget* entry_boxRefinement_selectedLengthX = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_selectedLengthX); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedLengthX, - 1, 2, 10, 11, - (GtkAttachOptions)(GTK_FILL), + //- entries for side lengths + GtkWidget* entry_boxRefinement_selectedLengthX = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_selectedLengthX); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedLengthX, + 1, 2, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_boxRefinement_selectedLengthY = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_selectedLengthY); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedLengthY, - 2, 3, 10, 11, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_boxRefinement_selectedLengthY = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_selectedLengthY); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedLengthY, + 2, 3, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_boxRefinement_selectedLengthZ = gtk_entry_new(); - gtk_widget_show(entry_boxRefinement_selectedLengthZ); - gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedLengthZ, - 3, 4, 10, 11, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_boxRefinement_selectedLengthZ = gtk_entry_new(); + gtk_widget_show(entry_boxRefinement_selectedLengthZ); + gtk_table_attach(GTK_TABLE(table1), entry_boxRefinement_selectedLengthZ, + 3, 4, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for removing patches - GtkWidget* button2 = gtk_button_new(); - gtk_widget_show(button2); - gtk_table_attach - ( - GTK_TABLE(table1), - button2, - 4, 5, 6, 11, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - g_signal_connect - ( - G_OBJECT(button2), - "clicked", - G_CALLBACK(removeBoxRefinement), - boxRefinementFramePtr_ - ); - - GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment2); - gtk_container_add(GTK_CONTAINER(button2), alignment2); - - GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox2); - gtk_container_add(GTK_CONTAINER(alignment2), hbox2); - - GtkWidget* image2 = - gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image2); - gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); - - GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); - + //- set the button for removing patches + GtkWidget* button2 = gtk_button_new(); + gtk_widget_show(button2); + gtk_table_attach + ( + GTK_TABLE(table1), + button2, + 4, 5, 6, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + g_signal_connect + ( + G_OBJECT(button2), + "clicked", + G_CALLBACK(removeBoxRefinement), + boxRefinementFramePtr_ + ); + + GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment2); + gtk_container_add(GTK_CONTAINER(button2), alignment2); + + GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox2); + gtk_container_add(GTK_CONTAINER(alignment2), hbox2); + + GtkWidget* image2 = + gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image2); + gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); + + GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); + gtk_widget_show(label5); + gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - boxRefinementFramePtr_, - boxRefinementFramePtr_, - "boxRefinementFramePtr_"); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - table1, - "table1" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxName, - "entry_boxName" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_cellSize, - "entry_boxRefinement_cellSize" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_centreX, - "entry_boxRefinement_centreX" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_centreY, - "entry_boxRefinement_centreY" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_centreZ, - "entry_boxRefinement_centreZ" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_lengthX, - "entry_boxRefinement_lengthX" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_lengthY, - "entry_boxRefinement_lengthY" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_lengthZ, - "entry_boxRefinement_lengthZ" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - comboboxentry_boxRefinement_createdBoxes, - "comboboxentry_boxRefinement_createdBoxes" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_selectedCellSize, - "entry_boxRefinement_selectedCellSize" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_selectedCentreX, - "entry_boxRefinement_selectedCentreX" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_selectedCentreY, - "entry_boxRefinement_selectedCentreY" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_selectedCentreZ, - "entry_boxRefinement_selectedCentreZ" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_selectedLengthX, - "entry_boxRefinement_selectedLengthX" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_selectedLengthY, - "entry_boxRefinement_selectedLengthY" - ); - GLADE_HOOKUP_OBJECT - ( - boxRefinementFramePtr_, - entry_boxRefinement_selectedLengthZ, - "entry_boxRefinement_selectedLengthZ" - ); - - updateBoxRefinements(boxRefinementFramePtr_); - - g_signal_connect - ( - G_OBJECT - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_boxRefinement_createdBoxes)->entry - ) - ), - "changed", - G_CALLBACK(showDataForBoxRefinement), - boxRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_boxRefinement_selectedCellSize), - "changed", - G_CALLBACK(resetValuesForSelectedBox), - boxRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_boxRefinement_selectedCentreX), - "changed", - G_CALLBACK(resetValuesForSelectedBox), - boxRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_boxRefinement_selectedCentreY), - "changed", - G_CALLBACK(resetValuesForSelectedBox), - boxRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_boxRefinement_selectedCentreZ), - "changed", - G_CALLBACK(resetValuesForSelectedBox), - boxRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_boxRefinement_selectedLengthX), - "changed", - G_CALLBACK(resetValuesForSelectedBox), - boxRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_boxRefinement_selectedLengthY), - "changed", - G_CALLBACK(resetValuesForSelectedBox), - boxRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_boxRefinement_selectedLengthZ), - "changed", - G_CALLBACK(resetValuesForSelectedBox), - boxRefinementFramePtr_ - ); - - gtk_widget_show(boxRefinementFramePtr_); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + boxRefinementFramePtr_, + boxRefinementFramePtr_, + "boxRefinementFramePtr_"); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + table1, + "table1" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxName, + "entry_boxName" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_cellSize, + "entry_boxRefinement_cellSize" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_centreX, + "entry_boxRefinement_centreX" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_centreY, + "entry_boxRefinement_centreY" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_centreZ, + "entry_boxRefinement_centreZ" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_lengthX, + "entry_boxRefinement_lengthX" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_lengthY, + "entry_boxRefinement_lengthY" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_lengthZ, + "entry_boxRefinement_lengthZ" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + comboboxentry_boxRefinement_createdBoxes, + "comboboxentry_boxRefinement_createdBoxes" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_selectedCellSize, + "entry_boxRefinement_selectedCellSize" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_selectedCentreX, + "entry_boxRefinement_selectedCentreX" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_selectedCentreY, + "entry_boxRefinement_selectedCentreY" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_selectedCentreZ, + "entry_boxRefinement_selectedCentreZ" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_selectedLengthX, + "entry_boxRefinement_selectedLengthX" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_selectedLengthY, + "entry_boxRefinement_selectedLengthY" + ); + GLADE_HOOKUP_OBJECT + ( + boxRefinementFramePtr_, + entry_boxRefinement_selectedLengthZ, + "entry_boxRefinement_selectedLengthZ" + ); + + updateBoxRefinements(boxRefinementFramePtr_); + + g_signal_connect + ( + G_OBJECT + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_boxRefinement_createdBoxes)->entry + ) + ), + "changed", + G_CALLBACK(showDataForBoxRefinement), + boxRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_boxRefinement_selectedCellSize), + "changed", + G_CALLBACK(resetValuesForSelectedBox), + boxRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_boxRefinement_selectedCentreX), + "changed", + G_CALLBACK(resetValuesForSelectedBox), + boxRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_boxRefinement_selectedCentreY), + "changed", + G_CALLBACK(resetValuesForSelectedBox), + boxRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_boxRefinement_selectedCentreZ), + "changed", + G_CALLBACK(resetValuesForSelectedBox), + boxRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_boxRefinement_selectedLengthX), + "changed", + G_CALLBACK(resetValuesForSelectedBox), + boxRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_boxRefinement_selectedLengthY), + "changed", + G_CALLBACK(resetValuesForSelectedBox), + boxRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_boxRefinement_selectedLengthZ), + "changed", + G_CALLBACK(resetValuesForSelectedBox), + boxRefinementFramePtr_ + ); + + gtk_widget_show(boxRefinementFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKConeRefinement.C b/GUI/meshGenGTK/meshGenGTKConeRefinement.C index 43b978e..791b512 100644 --- a/GUI/meshGenGTK/meshGenGTKConeRefinement.C +++ b/GUI/meshGenGTK/meshGenGTKConeRefinement.C @@ -43,1198 +43,1198 @@ extern "C" static void showDataForConeRefinement ( - GtkWidget* widget, - GtkWidget* coneRefinementFramePtr + GtkWidget* widget, + GtkWidget* coneRefinementFramePtr ) { - GtkWidget* comboboxentry_coneRefinement_createdCones = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "comboboxentry_coneRefinement_createdCones" - ); - GtkWidget* entry_coneRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedCellSize" - ); - GtkWidget* entry_coneRefinement_selectedP0X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP0X" - ); - GtkWidget* entry_coneRefinement_selectedP0Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP0Y" - ); - GtkWidget* entry_coneRefinement_selectedP0Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP0Z" - ); - GtkWidget* entry_coneRefinement_selectedRadius0 = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedRadius0" - ); - GtkWidget* entry_coneRefinement_selectedP1X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP1X" - ); - GtkWidget* entry_coneRefinement_selectedP1Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP1Y" - ); - GtkWidget* entry_coneRefinement_selectedP1Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP1Z" - ); - GtkWidget* entry_coneRefinement_selectedRadius1 = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedRadius1" - ); - - //- find the object in the dictionary - const word coneName = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_coneRefinement_createdCones)->entry - ) - ); - - const PtrList refs = guiPtr->objectRefinements(); - - forAll(refs, refI) - if( refs[refI].keyword() == coneName ) - { - const dictionary dict = refs[refI].dict(); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedCellSize), - help::scalarToText - ( - scalar(readScalar(dict.lookup("cellSize"))) - ).c_str() - ); - const vector p0(dict.lookup("p0")); - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedP0X), - help::scalarToText(p0.x()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedP0Y), - help::scalarToText(p0.y()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedP0Z), - help::scalarToText(p0.z()).c_str() - ); - const scalar r0(readScalar(dict.lookup("radius0"))); - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedRadius0), - help::scalarToText(r0).c_str() - ); - - const vector p1(dict.lookup("p1")); - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedP1X), - help::scalarToText(p1.x()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedP1Y), - help::scalarToText(p1.y()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedP1Z), - help::scalarToText(p1.z()).c_str() - ); - const scalar r1(readScalar(dict.lookup("radius1"))); - gtk_entry_set_text - ( - GTK_ENTRY(entry_coneRefinement_selectedRadius1), - help::scalarToText(r1).c_str() - ); - - return; - } - - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedCellSize), ""); - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP0X), ""); - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP0Y), ""); - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP0Z), ""); - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedRadius0), ""); - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP1X), ""); - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP1Y), ""); - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP1Z), ""); - gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedRadius1), ""); + GtkWidget* comboboxentry_coneRefinement_createdCones = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "comboboxentry_coneRefinement_createdCones" + ); + GtkWidget* entry_coneRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedCellSize" + ); + GtkWidget* entry_coneRefinement_selectedP0X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP0X" + ); + GtkWidget* entry_coneRefinement_selectedP0Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP0Y" + ); + GtkWidget* entry_coneRefinement_selectedP0Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP0Z" + ); + GtkWidget* entry_coneRefinement_selectedRadius0 = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedRadius0" + ); + GtkWidget* entry_coneRefinement_selectedP1X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP1X" + ); + GtkWidget* entry_coneRefinement_selectedP1Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP1Y" + ); + GtkWidget* entry_coneRefinement_selectedP1Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP1Z" + ); + GtkWidget* entry_coneRefinement_selectedRadius1 = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedRadius1" + ); + + //- find the object in the dictionary + const word coneName = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_coneRefinement_createdCones)->entry + ) + ); + + const PtrList refs = guiPtr->objectRefinements(); + + forAll(refs, refI) + if( refs[refI].keyword() == coneName ) + { + const dictionary dict = refs[refI].dict(); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedCellSize), + help::scalarToText + ( + scalar(readScalar(dict.lookup("cellSize"))) + ).c_str() + ); + const vector p0(dict.lookup("p0")); + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedP0X), + help::scalarToText(p0.x()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedP0Y), + help::scalarToText(p0.y()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedP0Z), + help::scalarToText(p0.z()).c_str() + ); + const scalar r0(readScalar(dict.lookup("radius0"))); + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedRadius0), + help::scalarToText(r0).c_str() + ); + + const vector p1(dict.lookup("p1")); + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedP1X), + help::scalarToText(p1.x()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedP1Y), + help::scalarToText(p1.y()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedP1Z), + help::scalarToText(p1.z()).c_str() + ); + const scalar r1(readScalar(dict.lookup("radius1"))); + gtk_entry_set_text + ( + GTK_ENTRY(entry_coneRefinement_selectedRadius1), + help::scalarToText(r1).c_str() + ); + + return; + } + + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedCellSize), ""); + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP0X), ""); + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP0Y), ""); + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP0Z), ""); + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedRadius0), ""); + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP1X), ""); + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP1Y), ""); + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedP1Z), ""); + gtk_entry_set_text(GTK_ENTRY(entry_coneRefinement_selectedRadius1), ""); } static void resetValuesForSelectedCone ( - GtkWidget* widget, - GtkWidget* coneRefinementFramePtr + GtkWidget* widget, + GtkWidget* coneRefinementFramePtr ) { - GtkWidget* comboboxentry_coneRefinement_createdCones = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "comboboxentry_coneRefinement_createdCones" - ); - GtkWidget* entry_coneRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedCellSize" - ); - GtkWidget* entry_coneRefinement_selectedP0X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP0X" - ); - GtkWidget* entry_coneRefinement_selectedP0Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP0Y" - ); - GtkWidget* entry_coneRefinement_selectedP0Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP0Z" - ); - GtkWidget* entry_coneRefinement_selectedRadius0 = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedRadius0" - ); - GtkWidget* entry_coneRefinement_selectedP1X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP1X" - ); - GtkWidget* entry_coneRefinement_selectedP1Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP1Y" - ); - GtkWidget* entry_coneRefinement_selectedP1Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedP1Z" - ); - GtkWidget* entry_coneRefinement_selectedRadius1 = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_selectedRadius1" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_coneRefinement_createdCones - )->entry - ) - ); - - if( name == "" ) - return; - - const PtrList refs = guiPtr->objectRefinements(); - dictionary dict; - forAll(refs, refI) - if( refs[refI].keyword() == name ) - dict = refs[refI].dict(); - guiPtr->removeObjectRefinement(name); - if( widget == entry_coneRefinement_selectedCellSize ) - { - const word size = - gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedCellSize)); - dict.remove("cellSize"); - dict.add("cellSize", help::textToScalar(size)); - } - else if( widget == entry_coneRefinement_selectedP0X ) - { - point p0(dict.lookup("p0")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP0X)); - dict.remove("p0"); - p0.x() = help::textToScalar(c); - dict.add("p0", p0); - } - else if( widget == entry_coneRefinement_selectedP0Y ) - { - point p0(dict.lookup("p0")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP0Y)); - dict.remove("p0"); - p0.y() = help::textToScalar(c); - dict.add("p0", p0); - } - else if( widget == entry_coneRefinement_selectedP0Z ) - { - point p0(dict.lookup("p0")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP0Z)); - dict.remove("p0"); - p0.z() = help::textToScalar(c); - dict.add("p0", p0); - } - else if( widget == entry_coneRefinement_selectedRadius0 ) - { - scalar r0(readScalar(dict.lookup("radius0"))); - const word c = - gtk_entry_get_text - ( - GTK_ENTRY(entry_coneRefinement_selectedRadius0) - ); - dict.remove("radius0"); - r0 = help::textToScalar(c); - dict.add("radius0", r0); - } - else if( widget == entry_coneRefinement_selectedP1X ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP1X)); - point p1(dict.lookup("p1")); - dict.remove("p1"); - p1.x() = help::textToScalar(l); - dict.add("p1", p1); - } - else if( widget == entry_coneRefinement_selectedP1Y ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP1Y)); - point p1(dict.lookup("p1")); - dict.remove("p1"); - p1.y() = help::textToScalar(l); - dict.add("p1", p1); - } - else if( widget == entry_coneRefinement_selectedP1Z ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP1Z)); - point p1(dict.lookup("p1")); - dict.remove("p1"); - p1.z() = help::textToScalar(l); - dict.add("p1", p1); - } - else if( widget == entry_coneRefinement_selectedRadius1 ) - { - scalar r1(readScalar(dict.lookup("radius1"))); - const word c = - gtk_entry_get_text - ( - GTK_ENTRY(entry_coneRefinement_selectedRadius1) - ); - dict.remove("radius1"); - r1 = help::textToScalar(c); - dict.add("radius1", r1); - } - - coneRefinement cr(name, dict); - guiPtr->addObjectRefinement(cr); + GtkWidget* comboboxentry_coneRefinement_createdCones = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "comboboxentry_coneRefinement_createdCones" + ); + GtkWidget* entry_coneRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedCellSize" + ); + GtkWidget* entry_coneRefinement_selectedP0X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP0X" + ); + GtkWidget* entry_coneRefinement_selectedP0Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP0Y" + ); + GtkWidget* entry_coneRefinement_selectedP0Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP0Z" + ); + GtkWidget* entry_coneRefinement_selectedRadius0 = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedRadius0" + ); + GtkWidget* entry_coneRefinement_selectedP1X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP1X" + ); + GtkWidget* entry_coneRefinement_selectedP1Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP1Y" + ); + GtkWidget* entry_coneRefinement_selectedP1Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedP1Z" + ); + GtkWidget* entry_coneRefinement_selectedRadius1 = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_selectedRadius1" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_coneRefinement_createdCones + )->entry + ) + ); + + if( name == "" ) + return; + + const PtrList refs = guiPtr->objectRefinements(); + dictionary dict; + forAll(refs, refI) + if( refs[refI].keyword() == name ) + dict = refs[refI].dict(); + guiPtr->removeObjectRefinement(name); + if( widget == entry_coneRefinement_selectedCellSize ) + { + const word size = + gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedCellSize)); + dict.remove("cellSize"); + dict.add("cellSize", help::textToScalar(size)); + } + else if( widget == entry_coneRefinement_selectedP0X ) + { + point p0(dict.lookup("p0")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP0X)); + dict.remove("p0"); + p0.x() = help::textToScalar(c); + dict.add("p0", p0); + } + else if( widget == entry_coneRefinement_selectedP0Y ) + { + point p0(dict.lookup("p0")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP0Y)); + dict.remove("p0"); + p0.y() = help::textToScalar(c); + dict.add("p0", p0); + } + else if( widget == entry_coneRefinement_selectedP0Z ) + { + point p0(dict.lookup("p0")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP0Z)); + dict.remove("p0"); + p0.z() = help::textToScalar(c); + dict.add("p0", p0); + } + else if( widget == entry_coneRefinement_selectedRadius0 ) + { + scalar r0(readScalar(dict.lookup("radius0"))); + const word c = + gtk_entry_get_text + ( + GTK_ENTRY(entry_coneRefinement_selectedRadius0) + ); + dict.remove("radius0"); + r0 = help::textToScalar(c); + dict.add("radius0", r0); + } + else if( widget == entry_coneRefinement_selectedP1X ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP1X)); + point p1(dict.lookup("p1")); + dict.remove("p1"); + p1.x() = help::textToScalar(l); + dict.add("p1", p1); + } + else if( widget == entry_coneRefinement_selectedP1Y ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP1Y)); + point p1(dict.lookup("p1")); + dict.remove("p1"); + p1.y() = help::textToScalar(l); + dict.add("p1", p1); + } + else if( widget == entry_coneRefinement_selectedP1Z ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_coneRefinement_selectedP1Z)); + point p1(dict.lookup("p1")); + dict.remove("p1"); + p1.z() = help::textToScalar(l); + dict.add("p1", p1); + } + else if( widget == entry_coneRefinement_selectedRadius1 ) + { + scalar r1(readScalar(dict.lookup("radius1"))); + const word c = + gtk_entry_get_text + ( + GTK_ENTRY(entry_coneRefinement_selectedRadius1) + ); + dict.remove("radius1"); + r1 = help::textToScalar(c); + dict.add("radius1", r1); + } + + coneRefinement cr(name, dict); + guiPtr->addObjectRefinement(cr); } static void updateConeRefinements(GtkWidget* coneRefinementFramePtr) { - GtkWidget* comboboxentry_coneRefinement_createdCones = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "comboboxentry_coneRefinement_createdCones" - ); - - const PtrList refs = guiPtr->objectRefinements(); - label nCones(0); - GList* createdCones = 0; - forAll(refs, refI) - { - const word& key = refs[refI].keyword(); - const dictionary& dict = refs[refI].dict(); - const word type(dict.lookup("type")); - - if( type == "cone" ) - { - ++nCones; - coneRefinement cone(key, dict); - createdCones = - g_list_append - ( - createdCones, - const_cast(cone.name().c_str()) - ); - } - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_coneRefinement_createdCones - ), createdCones - ); - - if( nCones == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_coneRefinement_createdCones)->entry - ), - "" - ); - } - - g_list_free(createdCones); - - showDataForConeRefinement(NULL, coneRefinementFramePtr); + GtkWidget* comboboxentry_coneRefinement_createdCones = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "comboboxentry_coneRefinement_createdCones" + ); + + const PtrList refs = guiPtr->objectRefinements(); + label nCones(0); + GList* createdCones = 0; + forAll(refs, refI) + { + const word& key = refs[refI].keyword(); + const dictionary& dict = refs[refI].dict(); + const word type(dict.lookup("type")); + + if( type == "cone" ) + { + ++nCones; + coneRefinement cone(key, dict); + createdCones = + g_list_append + ( + createdCones, + const_cast(cone.name().c_str()) + ); + } + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_coneRefinement_createdCones + ), createdCones + ); + + if( nCones == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_coneRefinement_createdCones)->entry + ), + "" + ); + } + + g_list_free(createdCones); + + showDataForConeRefinement(NULL, coneRefinementFramePtr); } static void addConeRefinement ( - GtkWidget* button, - GtkWidget* coneRefinementFramePtr + GtkWidget* button, + GtkWidget* coneRefinementFramePtr ) { - GtkWidget* name = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneName" - ); - GtkWidget* cellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_cellSize" - ); - GtkWidget* p0X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_p0X" - ); - GtkWidget* p0Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_p0Y" - ); - GtkWidget* p0Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_p0Z" - ); - GtkWidget* r0 = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_radius0" - ); - GtkWidget* p1X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_p1X" - ); - GtkWidget* p1Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_p1Y" - ); - GtkWidget* p1Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_p1Z" - ); - GtkWidget* r1 = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "entry_coneRefinement_radius1" - ); - - //- create all necessary settings - const word coneName = gtk_entry_get_text(GTK_ENTRY(name)); - gtk_entry_set_text(GTK_ENTRY(name), ""); - const scalar coneCellSize = - help::textToScalar(gtk_entry_get_text(GTK_ENTRY(cellSize))); - gtk_entry_set_text(GTK_ENTRY(cellSize), ""); - point p0, p1; - scalar radius0, radius1; - p0.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0X))); - gtk_entry_set_text(GTK_ENTRY(p0X), ""); - p0.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0Y))); - gtk_entry_set_text(GTK_ENTRY(p0Y), ""); - p0.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0Z))); - gtk_entry_set_text(GTK_ENTRY(p0Z), ""); - radius0 = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(r0))); - gtk_entry_set_text(GTK_ENTRY(r0), ""); - p1.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1X))); - gtk_entry_set_text(GTK_ENTRY(p1X), ""); - p1.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1Y))); - gtk_entry_set_text(GTK_ENTRY(p1Y), ""); - p1.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1Z))); - gtk_entry_set_text(GTK_ENTRY(p1Z), ""); - radius1 = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(r1))); - gtk_entry_set_text(GTK_ENTRY(r1), ""); - - coneRefinement cone - ( - coneName, - coneCellSize, - p0, - radius0, - p1, - radius1 - ); - - guiPtr->addObjectRefinement(cone); - - updateConeRefinements(coneRefinementFramePtr); + GtkWidget* name = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneName" + ); + GtkWidget* cellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_cellSize" + ); + GtkWidget* p0X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_p0X" + ); + GtkWidget* p0Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_p0Y" + ); + GtkWidget* p0Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_p0Z" + ); + GtkWidget* r0 = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_radius0" + ); + GtkWidget* p1X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_p1X" + ); + GtkWidget* p1Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_p1Y" + ); + GtkWidget* p1Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_p1Z" + ); + GtkWidget* r1 = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "entry_coneRefinement_radius1" + ); + + //- create all necessary settings + const word coneName = gtk_entry_get_text(GTK_ENTRY(name)); + gtk_entry_set_text(GTK_ENTRY(name), ""); + const scalar coneCellSize = + help::textToScalar(gtk_entry_get_text(GTK_ENTRY(cellSize))); + gtk_entry_set_text(GTK_ENTRY(cellSize), ""); + point p0, p1; + scalar radius0, radius1; + p0.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0X))); + gtk_entry_set_text(GTK_ENTRY(p0X), ""); + p0.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0Y))); + gtk_entry_set_text(GTK_ENTRY(p0Y), ""); + p0.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0Z))); + gtk_entry_set_text(GTK_ENTRY(p0Z), ""); + radius0 = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(r0))); + gtk_entry_set_text(GTK_ENTRY(r0), ""); + p1.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1X))); + gtk_entry_set_text(GTK_ENTRY(p1X), ""); + p1.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1Y))); + gtk_entry_set_text(GTK_ENTRY(p1Y), ""); + p1.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1Z))); + gtk_entry_set_text(GTK_ENTRY(p1Z), ""); + radius1 = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(r1))); + gtk_entry_set_text(GTK_ENTRY(r1), ""); + + coneRefinement cone + ( + coneName, + coneCellSize, + p0, + radius0, + p1, + radius1 + ); + + guiPtr->addObjectRefinement(cone); + + updateConeRefinements(coneRefinementFramePtr); } static void removeConeRefinement ( - GtkWidget* button, - GtkWidget* coneRefinementFramePtr + GtkWidget* button, + GtkWidget* coneRefinementFramePtr ) { - GtkWidget* createdCones = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(coneRefinementFramePtr), - "comboboxentry_coneRefinement_createdCones" - ); - - const word coneName = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(createdCones)->entry - ) - ); + GtkWidget* createdCones = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(coneRefinementFramePtr), + "comboboxentry_coneRefinement_createdCones" + ); + + const word coneName = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(createdCones)->entry + ) + ); - guiPtr->removeObjectRefinement(coneName); + guiPtr->removeObjectRefinement(coneName); - updateConeRefinements(coneRefinementFramePtr); + updateConeRefinements(coneRefinementFramePtr); } } void meshGenGTK::createConeRefinementWindowPage() { - guiPtr = &meshGui_; - - coneRefinementFramePtr_ = gtk_frame_new(NULL); + guiPtr = &meshGui_; + + coneRefinementFramePtr_ = gtk_frame_new(NULL); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a table - GtkWidget* table1 = gtk_table_new(5, 15, FALSE); - gtk_widget_show(table1); - gtk_container_add - ( - GTK_CONTAINER(coneRefinementFramePtr_), - table1 - ); + //- create a table + GtkWidget* table1 = gtk_table_new(5, 15, FALSE); + gtk_widget_show(table1); + gtk_container_add + ( + GTK_CONTAINER(coneRefinementFramePtr_), + table1 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for cone name - GtkWidget* label_coneName = gtk_label_new("Cone name"); - gtk_widget_show(label_coneName); - gtk_table_attach(GTK_TABLE(table1), label_coneName, 0, 1, 0, 1, + //- create a label for cone name + GtkWidget* label_coneName = gtk_label_new("Cone name"); + gtk_widget_show(label_coneName); + gtk_table_attach(GTK_TABLE(table1), label_coneName, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_coneName), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_coneName), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create an entry for cone name - GtkWidget* entry_coneName = gtk_entry_new(); - gtk_widget_show(entry_coneName); - - gtk_table_attach(GTK_TABLE(table1), entry_coneName, 1, 4, 0, 1, - (GtkAttachOptions)(GTK_FILL), + //- create an entry for cone name + GtkWidget* entry_coneName = gtk_entry_new(); + gtk_widget_show(entry_coneName); + + gtk_table_attach(GTK_TABLE(table1), entry_coneName, 1, 4, 0, 1, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for desired cell size - GtkWidget* label_coneRefinement_cellSize = gtk_label_new("Cell size [m]"); - gtk_widget_show(label_coneRefinement_cellSize); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_cellSize, - 0, 1, 1, 2, - (GtkAttachOptions)(GTK_FILL), + //- create a label for desired cell size + GtkWidget* label_coneRefinement_cellSize = gtk_label_new("Cell size [m]"); + gtk_widget_show(label_coneRefinement_cellSize); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_cellSize, + 0, 1, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_cellSize), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_cellSize), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for desired cell size - GtkWidget* entry_coneRefinement_cellSize = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_cellSize); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_cellSize, - 1, 4, 1, 2, - (GtkAttachOptions)(GTK_FILL), + //- create a label for desired cell size + GtkWidget* entry_coneRefinement_cellSize = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_cellSize); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_cellSize, + 1, 4, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create labels for axes - GtkWidget* label_axes = gtk_label_new("X"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 1, 2, 2, 3, - (GtkAttachOptions)(GTK_FILL), + //- create labels for axes + GtkWidget* label_axes = gtk_label_new("X"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 1, 2, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Y"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 2, 3, 2, 3, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Y"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 2, 3, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Z"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 3, 4, 2, 3, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Z"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 3, 4, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for p0 - GtkWidget* label_coneRefinement_p0 = gtk_label_new("Starting point"); - gtk_widget_show(label_coneRefinement_p0); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_p0, - 0, 1, 3, 4, - (GtkAttachOptions)(GTK_FILL), + //- label for p0 + GtkWidget* label_coneRefinement_p0 = gtk_label_new("Starting point"); + gtk_widget_show(label_coneRefinement_p0); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_p0, + 0, 1, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_p0), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_p0), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for p0 - GtkWidget* entry_coneRefinement_p0X = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_p0X); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p0X, - 1, 2, 3, 4, - (GtkAttachOptions)(GTK_FILL), + //- entries for p0 + GtkWidget* entry_coneRefinement_p0X = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_p0X); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p0X, + 1, 2, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_coneRefinement_p0Y = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_p0Y); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p0Y, - 2, 3, 3, 4, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_coneRefinement_p0Y = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_p0Y); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p0Y, + 2, 3, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_coneRefinement_p0Z = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_p0Z); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p0Z, - 3, 4, 3, 4, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_coneRefinement_p0Z = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_p0Z); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p0Z, + 3, 4, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for p1 - GtkWidget* label_coneRefinement_p1 = gtk_label_new("End point"); - gtk_widget_show(label_coneRefinement_p1); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_p1, - 0, 1, 4, 5, - (GtkAttachOptions)(GTK_FILL), + //- label for p1 + GtkWidget* label_coneRefinement_p1 = gtk_label_new("End point"); + gtk_widget_show(label_coneRefinement_p1); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_p1, + 0, 1, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_p1), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_p1), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for p1 - GtkWidget* entry_coneRefinement_p1X = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_p1X); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p1X, - 1, 2, 4, 5, - (GtkAttachOptions)(GTK_FILL), + //- entries for p1 + GtkWidget* entry_coneRefinement_p1X = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_p1X); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p1X, + 1, 2, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_coneRefinement_p1Y = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_p1Y); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p1Y, - 2, 3, 4, 5, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_coneRefinement_p1Y = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_p1Y); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p1Y, + 2, 3, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_coneRefinement_p1Z = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_p1Z); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p1Z, - 3, 4, 4, 5, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_coneRefinement_p1Z = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_p1Z); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_p1Z, + 3, 4, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for radius0 - GtkWidget* label_coneRefinement_radius0 = - gtk_label_new("Starting radius [m]"); - gtk_widget_show(label_coneRefinement_radius0); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_radius0, - 0, 1, 5, 6, - (GtkAttachOptions)(GTK_FILL), + //- label for radius0 + GtkWidget* label_coneRefinement_radius0 = + gtk_label_new("Starting radius [m]"); + gtk_widget_show(label_coneRefinement_radius0); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_radius0, + 0, 1, 5, 6, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_radius0), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_radius0), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entry for radius0 - GtkWidget* entry_coneRefinement_radius0 = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_radius0); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_radius0, - 1, 4, 5, 6, - (GtkAttachOptions)(GTK_FILL), + //- entry for radius0 + GtkWidget* entry_coneRefinement_radius0 = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_radius0); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_radius0, + 1, 4, 5, 6, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for radius1 - GtkWidget* label_coneRefinement_radius1 = gtk_label_new("End radius [m]"); - gtk_widget_show(label_coneRefinement_radius1); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_radius1, - 0, 1, 6, 7, - (GtkAttachOptions)(GTK_FILL), + //- label for radius1 + GtkWidget* label_coneRefinement_radius1 = gtk_label_new("End radius [m]"); + gtk_widget_show(label_coneRefinement_radius1); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_radius1, + 0, 1, 6, 7, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_radius1), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_radius1), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entry for radius1 - GtkWidget* entry_coneRefinement_radius1 = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_radius1); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_radius1, - 1, 4, 6, 7, - (GtkAttachOptions)(GTK_FILL), + //- entry for radius1 + GtkWidget* entry_coneRefinement_radius1 = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_radius1); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_radius1, + 1, 4, 6, 7, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for adding cones - GtkWidget* button1 = gtk_button_new(); - gtk_widget_show(button1); - gtk_table_attach - ( - GTK_TABLE(table1), - button1, - 4, 5, 0, 7, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - g_signal_connect - ( - G_OBJECT(button1), - "clicked", - G_CALLBACK(addConeRefinement), - coneRefinementFramePtr_ - ); + //- set the button for adding cones + GtkWidget* button1 = gtk_button_new(); + gtk_widget_show(button1); + gtk_table_attach + ( + GTK_TABLE(table1), + button1, + 4, 5, 0, 7, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + g_signal_connect + ( + G_OBJECT(button1), + "clicked", + G_CALLBACK(addConeRefinement), + coneRefinementFramePtr_ + ); - GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(button1), alignment1); - - GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox1); - gtk_container_add(GTK_CONTAINER(alignment1), hbox1); - - GtkWidget* image1 = - gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); - - GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); - gtk_widget_show(label3); - gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); - + GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(button1), alignment1); + + GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox1); + gtk_container_add(GTK_CONTAINER(alignment1), hbox1); + + GtkWidget* image1 = + gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); + + GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); + gtk_widget_show(label3); + gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- horizontal separator - GtkWidget* hseparator0 = gtk_hseparator_new(); - gtk_widget_show(hseparator0); - gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 7, 8, + //- horizontal separator + GtkWidget* hseparator0 = gtk_hseparator_new(); + gtk_widget_show(hseparator0); + gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 7, 8, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); + 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for existing cone objects - GtkWidget* label_coneRefinement_existing = gtk_label_new("Existing cones"); - gtk_widget_show(label_coneRefinement_existing); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_existing, - 0, 1, 8, 9, - (GtkAttachOptions)(GTK_FILL), + //- label for existing cone objects + GtkWidget* label_coneRefinement_existing = gtk_label_new("Existing cones"); + gtk_widget_show(label_coneRefinement_existing); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_existing, + 0, 1, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- combobox for existing cone objects - GtkWidget* comboboxentry_coneRefinement_createdCones = - gtk_combo_new(); - gtk_widget_show(comboboxentry_coneRefinement_createdCones); - gtk_table_attach - ( - GTK_TABLE(table1),comboboxentry_coneRefinement_createdCones, - 1, 2, 8, 9, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions)(0), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO(comboboxentry_coneRefinement_createdCones)->entry - ), - 0 - ); - - + //- combobox for existing cone objects + GtkWidget* comboboxentry_coneRefinement_createdCones = + gtk_combo_new(); + gtk_widget_show(comboboxentry_coneRefinement_createdCones); + gtk_table_attach + ( + GTK_TABLE(table1),comboboxentry_coneRefinement_createdCones, + 1, 2, 8, 9, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO(comboboxentry_coneRefinement_createdCones)->entry + ), + 0 + ); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for selected cell size - GtkWidget* label_coneRefinement_selectedCellSize = - gtk_label_new("Cell size [m]"); - gtk_widget_show(label_coneRefinement_selectedCellSize); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedCellSize, - 0, 1, 9, 10, - (GtkAttachOptions)(GTK_FILL), + //- create a label for selected cell size + GtkWidget* label_coneRefinement_selectedCellSize = + gtk_label_new("Cell size [m]"); + gtk_widget_show(label_coneRefinement_selectedCellSize); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedCellSize, + 0, 1, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_coneRefinement_selectedCellSize), 0, 0.5 - ); - + gtk_misc_set_alignment + ( + GTK_MISC(label_coneRefinement_selectedCellSize), 0, 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for selected cell size - GtkWidget* entry_coneRefinement_selectedCellSize = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedCellSize); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedCellSize, - 1, 4, 9, 10, - (GtkAttachOptions)(GTK_FILL), + //- create a label for selected cell size + GtkWidget* entry_coneRefinement_selectedCellSize = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedCellSize); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedCellSize, + 1, 4, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create labels for axes - label_axes = gtk_label_new("X"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 1, 2, 10, 11, - (GtkAttachOptions)(GTK_FILL), + //- create labels for axes + label_axes = gtk_label_new("X"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 1, 2, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Y"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 2, 3, 10, 11, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Y"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 2, 3, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Z"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 3, 4, 10, 11, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Z"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 3, 4, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for p0 - GtkWidget* label_coneRefinement_selectedP0 = - gtk_label_new("Starting point"); - gtk_widget_show(label_coneRefinement_selectedP0); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedP0, - 0, 1, 11, 12, - (GtkAttachOptions)(GTK_FILL), + //- label for p0 + GtkWidget* label_coneRefinement_selectedP0 = + gtk_label_new("Starting point"); + gtk_widget_show(label_coneRefinement_selectedP0); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedP0, + 0, 1, 11, 12, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_selectedP0), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_coneRefinement_selectedP0), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for selected p0 - GtkWidget* entry_coneRefinement_selectedP0X = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedP0X); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP0X, - 1, 2, 11, 12, - (GtkAttachOptions)(GTK_FILL), + //- entries for selected p0 + GtkWidget* entry_coneRefinement_selectedP0X = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedP0X); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP0X, + 1, 2, 11, 12, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_coneRefinement_selectedP0Y = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedP0Y); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP0Y, - 2, 3, 11, 12, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_coneRefinement_selectedP0Y = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedP0Y); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP0Y, + 2, 3, 11, 12, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_coneRefinement_selectedP0Z = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedP0Z); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP0Z, - 3, 4, 11, 12, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_coneRefinement_selectedP0Z = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedP0Z); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP0Z, + 3, 4, 11, 12, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for selected p1 - GtkWidget* label_coneRefinement_selectedP1 = - gtk_label_new("End point"); - gtk_widget_show(label_coneRefinement_selectedP1); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedP1, - 0, 1, 12, 13, - (GtkAttachOptions)(GTK_FILL), + //- label for selected p1 + GtkWidget* label_coneRefinement_selectedP1 = + gtk_label_new("End point"); + gtk_widget_show(label_coneRefinement_selectedP1); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedP1, + 0, 1, 12, 13, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_coneRefinement_selectedP1), 0, 0.5 - ); + gtk_misc_set_alignment + ( + GTK_MISC(label_coneRefinement_selectedP1), 0, 0.5 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for p1 - GtkWidget* entry_coneRefinement_selectedP1X = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedP1X); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP1X, - 1, 2, 12, 13, - (GtkAttachOptions)(GTK_FILL), + //- entries for p1 + GtkWidget* entry_coneRefinement_selectedP1X = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedP1X); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP1X, + 1, 2, 12, 13, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_coneRefinement_selectedP1Y = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedP1Y); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP1Y, - 2, 3, 12, 13, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_coneRefinement_selectedP1Y = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedP1Y); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP1Y, + 2, 3, 12, 13, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_coneRefinement_selectedP1Z = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedP1Z); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP1Z, - 3, 4, 12, 13, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_coneRefinement_selectedP1Z = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedP1Z); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedP1Z, + 3, 4, 12, 13, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for selected radius0 - GtkWidget* label_coneRefinement_selectedRadius0 = - gtk_label_new("Starting radius [m]"); - gtk_widget_show(label_coneRefinement_selectedRadius0); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedRadius0, - 0, 1, 13, 14, - (GtkAttachOptions)(GTK_FILL), + //- label for selected radius0 + GtkWidget* label_coneRefinement_selectedRadius0 = + gtk_label_new("Starting radius [m]"); + gtk_widget_show(label_coneRefinement_selectedRadius0); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedRadius0, + 0, 1, 13, 14, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_coneRefinement_selectedRadius0), 0, 0.5 - ); + gtk_misc_set_alignment + ( + GTK_MISC(label_coneRefinement_selectedRadius0), 0, 0.5 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entry for selected radius0 - GtkWidget* entry_coneRefinement_selectedRadius0 = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedRadius0); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedRadius0, - 1, 4, 13, 14, - (GtkAttachOptions)(GTK_FILL), + //- entry for selected radius0 + GtkWidget* entry_coneRefinement_selectedRadius0 = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedRadius0); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedRadius0, + 1, 4, 13, 14, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for radius1 - GtkWidget* label_coneRefinement_selectedRadius1 = - gtk_label_new("End radius [m]"); - gtk_widget_show(label_coneRefinement_selectedRadius1); - gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedRadius1, - 0, 1, 14, 15, - (GtkAttachOptions)(GTK_FILL), + //- label for radius1 + GtkWidget* label_coneRefinement_selectedRadius1 = + gtk_label_new("End radius [m]"); + gtk_widget_show(label_coneRefinement_selectedRadius1); + gtk_table_attach(GTK_TABLE(table1), label_coneRefinement_selectedRadius1, + 0, 1, 14, 15, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_coneRefinement_selectedRadius1), 0, 0.5 - ); + gtk_misc_set_alignment + ( + GTK_MISC(label_coneRefinement_selectedRadius1), 0, 0.5 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entry for radius1 - GtkWidget* entry_coneRefinement_selectedRadius1 = gtk_entry_new(); - gtk_widget_show(entry_coneRefinement_selectedRadius1); - gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedRadius1, - 1, 4, 14, 15, - (GtkAttachOptions)(GTK_FILL), + //- entry for radius1 + GtkWidget* entry_coneRefinement_selectedRadius1 = gtk_entry_new(); + gtk_widget_show(entry_coneRefinement_selectedRadius1); + gtk_table_attach(GTK_TABLE(table1), entry_coneRefinement_selectedRadius1, + 1, 4, 14, 15, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for removing patches - GtkWidget* button2 = gtk_button_new(); - gtk_widget_show(button2); - gtk_table_attach - ( - GTK_TABLE(table1), - button2, - 4, 5, 8, 15, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - g_signal_connect - ( - G_OBJECT(button2), - "clicked", - G_CALLBACK(removeConeRefinement), - coneRefinementFramePtr_ - ); - - GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment2); - gtk_container_add(GTK_CONTAINER(button2), alignment2); - - GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox2); - gtk_container_add(GTK_CONTAINER(alignment2), hbox2); - - GtkWidget* image2 = - gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image2); - gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); - - GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); - + //- set the button for removing patches + GtkWidget* button2 = gtk_button_new(); + gtk_widget_show(button2); + gtk_table_attach + ( + GTK_TABLE(table1), + button2, + 4, 5, 8, 15, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + g_signal_connect + ( + G_OBJECT(button2), + "clicked", + G_CALLBACK(removeConeRefinement), + coneRefinementFramePtr_ + ); + + GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment2); + gtk_container_add(GTK_CONTAINER(button2), alignment2); + + GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox2); + gtk_container_add(GTK_CONTAINER(alignment2), hbox2); + + GtkWidget* image2 = + gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image2); + gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); + + GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); + gtk_widget_show(label5); + gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - coneRefinementFramePtr_, - coneRefinementFramePtr_, - "coneRefinementFramePtr_"); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - table1, - "table1" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneName, - "entry_coneName" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_cellSize, - "entry_coneRefinement_cellSize" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_p0X, - "entry_coneRefinement_p0X" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_p0Y, - "entry_coneRefinement_p0Y" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_radius0, - "entry_coneRefinement_radius0" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_radius1, - "entry_coneRefinement_radius1" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_p0Z, - "entry_coneRefinement_p0Z" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_p1X, - "entry_coneRefinement_p1X" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_p1Y, - "entry_coneRefinement_p1Y" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_p1Z, - "entry_coneRefinement_p1Z" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - comboboxentry_coneRefinement_createdCones, - "comboboxentry_coneRefinement_createdCones" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedCellSize, - "entry_coneRefinement_selectedCellSize" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedP0X, - "entry_coneRefinement_selectedP0X" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedP0Y, - "entry_coneRefinement_selectedP0Y" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedP0Z, - "entry_coneRefinement_selectedP0Z" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedRadius0, - "entry_coneRefinement_selectedRadius0" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedP1X, - "entry_coneRefinement_selectedP1X" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedP1Y, - "entry_coneRefinement_selectedP1Y" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedP1Z, - "entry_coneRefinement_selectedP1Z" - ); - GLADE_HOOKUP_OBJECT - ( - coneRefinementFramePtr_, - entry_coneRefinement_selectedRadius1, - "entry_coneRefinement_selectedRadius1" - ); - - updateConeRefinements(coneRefinementFramePtr_); - - g_signal_connect - ( - G_OBJECT - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_coneRefinement_createdCones)->entry - ) - ), - "changed", - G_CALLBACK(showDataForConeRefinement), - coneRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_coneRefinement_selectedCellSize), - "changed", - G_CALLBACK(resetValuesForSelectedCone), - coneRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_coneRefinement_selectedP0X), - "changed", - G_CALLBACK(resetValuesForSelectedCone), - coneRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_coneRefinement_selectedP0Y), - "changed", - G_CALLBACK(resetValuesForSelectedCone), - coneRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_coneRefinement_selectedP0Z), - "changed", - G_CALLBACK(resetValuesForSelectedCone), - coneRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_coneRefinement_selectedP1X), - "changed", - G_CALLBACK(resetValuesForSelectedCone), - coneRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_coneRefinement_selectedP1Y), - "changed", - G_CALLBACK(resetValuesForSelectedCone), - coneRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_coneRefinement_selectedP1Z), - "changed", - G_CALLBACK(resetValuesForSelectedCone), - coneRefinementFramePtr_ - ); - - gtk_widget_show(coneRefinementFramePtr_); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + coneRefinementFramePtr_, + coneRefinementFramePtr_, + "coneRefinementFramePtr_"); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + table1, + "table1" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneName, + "entry_coneName" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_cellSize, + "entry_coneRefinement_cellSize" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_p0X, + "entry_coneRefinement_p0X" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_p0Y, + "entry_coneRefinement_p0Y" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_radius0, + "entry_coneRefinement_radius0" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_radius1, + "entry_coneRefinement_radius1" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_p0Z, + "entry_coneRefinement_p0Z" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_p1X, + "entry_coneRefinement_p1X" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_p1Y, + "entry_coneRefinement_p1Y" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_p1Z, + "entry_coneRefinement_p1Z" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + comboboxentry_coneRefinement_createdCones, + "comboboxentry_coneRefinement_createdCones" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedCellSize, + "entry_coneRefinement_selectedCellSize" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedP0X, + "entry_coneRefinement_selectedP0X" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedP0Y, + "entry_coneRefinement_selectedP0Y" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedP0Z, + "entry_coneRefinement_selectedP0Z" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedRadius0, + "entry_coneRefinement_selectedRadius0" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedP1X, + "entry_coneRefinement_selectedP1X" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedP1Y, + "entry_coneRefinement_selectedP1Y" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedP1Z, + "entry_coneRefinement_selectedP1Z" + ); + GLADE_HOOKUP_OBJECT + ( + coneRefinementFramePtr_, + entry_coneRefinement_selectedRadius1, + "entry_coneRefinement_selectedRadius1" + ); + + updateConeRefinements(coneRefinementFramePtr_); + + g_signal_connect + ( + G_OBJECT + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_coneRefinement_createdCones)->entry + ) + ), + "changed", + G_CALLBACK(showDataForConeRefinement), + coneRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_coneRefinement_selectedCellSize), + "changed", + G_CALLBACK(resetValuesForSelectedCone), + coneRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_coneRefinement_selectedP0X), + "changed", + G_CALLBACK(resetValuesForSelectedCone), + coneRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_coneRefinement_selectedP0Y), + "changed", + G_CALLBACK(resetValuesForSelectedCone), + coneRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_coneRefinement_selectedP0Z), + "changed", + G_CALLBACK(resetValuesForSelectedCone), + coneRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_coneRefinement_selectedP1X), + "changed", + G_CALLBACK(resetValuesForSelectedCone), + coneRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_coneRefinement_selectedP1Y), + "changed", + G_CALLBACK(resetValuesForSelectedCone), + coneRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_coneRefinement_selectedP1Z), + "changed", + G_CALLBACK(resetValuesForSelectedCone), + coneRefinementFramePtr_ + ); + + gtk_widget_show(coneRefinementFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKGeneralPage.C b/GUI/meshGenGTK/meshGenGTKGeneralPage.C index 42be44f..8046914 100644 --- a/GUI/meshGenGTK/meshGenGTKGeneralPage.C +++ b/GUI/meshGenGTK/meshGenGTKGeneralPage.C @@ -34,136 +34,136 @@ Description namespace Foam { - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // callback functions - + extern "C" { - + static void useButtonCallback(GtkWidget* widget, gpointer data) { - if( (gchar*)data == "UseBndSize" ) - { - if( guiPtr->boundaryCellSizeEntryExist() ) - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); - guiPtr->removeBoundaryCellSize(); - } - else - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 1); - guiPtr->setBoundaryCellSize - ( - guiPtr->maxCellSize() - ); - } - } - else if( (gchar*)data == "UseAutoRef" ) - { - if( guiPtr->minCellSizeEntryExist() ) - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); - guiPtr->removeMinCellSize(); - } - else - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 1); - guiPtr->setMinCellSize(guiPtr->maxCellSize()); - } - } - else if( (gchar*)data == "UseKeepCellsIntersectingBoundary" ) - { - if( guiPtr->keepCellsIntersectingBoundaryEntryExist() ) - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); - guiPtr->removeKeepCellsIntersectingBoundary(); - - if( guiPtr->checkForGluedMeshEntryExist() ) - { - GtkWidget* checkButtonGluedMesh = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(widget), - "checkbutton_checkForGluedMesh" - ); - - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkButtonGluedMesh), - 0 - ); - guiPtr->removeCheckForGluedMesh(); - } - } - else - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 1); - guiPtr->setKeepCellsIntersectingBoundary(); - } - } - else if( (gchar*)(data) == "UseCheckForGluedMesh" ) - { - if( !guiPtr->keepCellsIntersectingBoundary() ) - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); - return; - } - - if( guiPtr->checkForGluedMeshEntryExist() ) - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); - guiPtr->removeCheckForGluedMesh(); - } - else - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 1); - guiPtr->setCheckForGluedMesh(); - } - } + if( (gchar*)data == "UseBndSize" ) + { + if( guiPtr->boundaryCellSizeEntryExist() ) + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); + guiPtr->removeBoundaryCellSize(); + } + else + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 1); + guiPtr->setBoundaryCellSize + ( + guiPtr->maxCellSize() + ); + } + } + else if( (gchar*)data == "UseAutoRef" ) + { + if( guiPtr->minCellSizeEntryExist() ) + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); + guiPtr->removeMinCellSize(); + } + else + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 1); + guiPtr->setMinCellSize(guiPtr->maxCellSize()); + } + } + else if( (gchar*)data == "UseKeepCellsIntersectingBoundary" ) + { + if( guiPtr->keepCellsIntersectingBoundaryEntryExist() ) + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); + guiPtr->removeKeepCellsIntersectingBoundary(); + + if( guiPtr->checkForGluedMeshEntryExist() ) + { + GtkWidget* checkButtonGluedMesh = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(widget), + "checkbutton_checkForGluedMesh" + ); + + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkButtonGluedMesh), + 0 + ); + guiPtr->removeCheckForGluedMesh(); + } + } + else + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 1); + guiPtr->setKeepCellsIntersectingBoundary(); + } + } + else if( (gchar*)(data) == "UseCheckForGluedMesh" ) + { + if( !guiPtr->keepCellsIntersectingBoundary() ) + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); + return; + } + + if( guiPtr->checkForGluedMeshEntryExist() ) + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0); + guiPtr->removeCheckForGluedMesh(); + } + else + { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 1); + guiPtr->setCheckForGluedMesh(); + } + } } static void enterSurfaceFile(GtkWidget* widget, GtkEntry* entry) { - const fileName file = gtk_entry_get_text(entry); - guiPtr->setSurfaceFileName(file); + const fileName file = gtk_entry_get_text(entry); + guiPtr->setSurfaceFileName(file); } static void enterMaxCellSize(GtkWidget* widget, GtkEntry* entry) { - const word s = gtk_entry_get_text(GTK_ENTRY(widget)); - const scalar size = help::textToScalar(s); - guiPtr->setMaxCellSize(size); + const word s = gtk_entry_get_text(GTK_ENTRY(widget)); + const scalar size = help::textToScalar(s); + guiPtr->setMaxCellSize(size); } static void enterBndCellSize(GtkWidget* widget, GtkEntry* entry) { - if( !guiPtr->boundaryCellSizeEntryExist() ) - return; - const word s = gtk_entry_get_text(GTK_ENTRY(widget)); - const scalar size = help::textToScalar(s); - guiPtr->setBoundaryCellSize(size); + if( !guiPtr->boundaryCellSizeEntryExist() ) + return; + const word s = gtk_entry_get_text(GTK_ENTRY(widget)); + const scalar size = help::textToScalar(s); + guiPtr->setBoundaryCellSize(size); } static void enterMinCellSize(GtkWidget* widget, GtkEntry* entry) { - if( !guiPtr->minCellSizeEntryExist() ) - return; - const word s = gtk_entry_get_text(GTK_ENTRY(widget)); - const scalar size = help::textToScalar(s); - guiPtr->setMinCellSize(size); + if( !guiPtr->minCellSizeEntryExist() ) + return; + const word s = gtk_entry_get_text(GTK_ENTRY(widget)); + const scalar size = help::textToScalar(s); + guiPtr->setMinCellSize(size); } static void editableEntry(GtkWidget *checkbutton, GtkWidget *entry) { - gtk_editable_set_editable - ( - GTK_EDITABLE(entry), - GTK_TOGGLE_BUTTON(checkbutton)->active - ); - - if( !GTK_TOGGLE_BUTTON(checkbutton)->active ) - gtk_entry_set_text(GTK_ENTRY(entry), ""); + gtk_editable_set_editable + ( + GTK_EDITABLE(entry), + GTK_TOGGLE_BUTTON(checkbutton)->active + ); + + if( !GTK_TOGGLE_BUTTON(checkbutton)->active ) + gtk_entry_set_text(GTK_ENTRY(entry), ""); } } @@ -172,384 +172,384 @@ static void editableEntry(GtkWidget *checkbutton, GtkWidget *entry) void meshGenGTK::createGeneralPage() { - guiPtr = &meshGui_; - - //- create a window for a general page - generalPageFramePtr_ = gtk_frame_new(NULL); - - GtkWidget* table1 = gtk_table_new (11, 5, FALSE); - gtk_widget_show(table1); - gtk_container_add(GTK_CONTAINER(generalPageFramePtr_), table1); + guiPtr = &meshGui_; + + //- create a window for a general page + generalPageFramePtr_ = gtk_frame_new(NULL); + + GtkWidget* table1 = gtk_table_new (11, 5, FALSE); + gtk_widget_show(table1); + gtk_container_add(GTK_CONTAINER(generalPageFramePtr_), table1); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the surface file - GtkWidget* label_surfaceFile = gtk_label_new("Surface file"); - gtk_widget_show(label_surfaceFile); - gtk_table_attach(GTK_TABLE(table1), label_surfaceFile, 1, 2, 0, 1, + //- set the surface file + GtkWidget* label_surfaceFile = gtk_label_new("Surface file"); + gtk_widget_show(label_surfaceFile); + gtk_table_attach(GTK_TABLE(table1), label_surfaceFile, 1, 2, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC (label_surfaceFile), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC (label_surfaceFile), 0, 0.5); - GtkWidget* label_Space = gtk_label_new(""); - gtk_widget_show(label_Space); - gtk_table_attach(GTK_TABLE(table1), label_Space, 2, 3, 0, 1, + GtkWidget* label_Space = gtk_label_new(""); + gtk_widget_show(label_Space); + gtk_table_attach(GTK_TABLE(table1), label_Space, 2, 3, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_widget_set_size_request(label_Space, 10, -1); - gtk_misc_set_alignment(GTK_MISC(label_Space), 0, 0.5); - - //- create entry box for the surface file - GtkWidget* entry_surfaceFile = gtk_entry_new(); - gtk_widget_show(entry_surfaceFile); - gtk_table_attach(GTK_TABLE(table1), entry_surfaceFile, 3, 4, 0, 1, + gtk_widget_set_size_request(label_Space, 10, -1); + gtk_misc_set_alignment(GTK_MISC(label_Space), 0, 0.5); + + //- create entry box for the surface file + GtkWidget* entry_surfaceFile = gtk_entry_new(); + gtk_widget_show(entry_surfaceFile); + gtk_table_attach(GTK_TABLE(table1), entry_surfaceFile, 3, 4, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_surfaceFile), - meshGui_.surfaceFileName().c_str() - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_surfaceFile), - 1 - ); - - g_signal_connect(G_OBJECT(entry_surfaceFile), "changed", - G_CALLBACK(enterSurfaceFile), - (gpointer)entry_surfaceFile); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_surfaceFile), + meshGui_.surfaceFileName().c_str() + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_surfaceFile), + 1 + ); + + g_signal_connect(G_OBJECT(entry_surfaceFile), "changed", + G_CALLBACK(enterSurfaceFile), + (gpointer)entry_surfaceFile); -/* GtkWidget* image1 = - gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_table_attach(GTK_TABLE (table1), image1, 4, 5, 0, 1, +/* GtkWidget* image1 = + gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_table_attach(GTK_TABLE (table1), image1, 4, 5, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_FILL), 0, 0); */ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- box for maxCellSize - GtkWidget* label_maxCellSize = gtk_label_new("Max cell size [m]"); - gtk_widget_show(label_maxCellSize); - gtk_table_attach(GTK_TABLE(table1), label_maxCellSize, 1, 2, 1, 2, + //- box for maxCellSize + GtkWidget* label_maxCellSize = gtk_label_new("Max cell size [m]"); + gtk_widget_show(label_maxCellSize); + gtk_table_attach(GTK_TABLE(table1), label_maxCellSize, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_maxCellSize), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_maxCellSize), 0, 0.5); - //- entry for maxCellSize - GtkWidget* entry_maxCellSize = gtk_entry_new(); - gtk_widget_show(entry_maxCellSize); - gtk_table_attach(GTK_TABLE(table1), entry_maxCellSize, 3, 5, 1, 2, + //- entry for maxCellSize + GtkWidget* entry_maxCellSize = gtk_entry_new(); + gtk_widget_show(entry_maxCellSize); + gtk_table_attach(GTK_TABLE(table1), entry_maxCellSize, 3, 5, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_maxCellSize), - help::scalarToText(meshGui_.maxCellSize()).c_str() - ); - - g_signal_connect - ( - G_OBJECT(entry_maxCellSize), "changed", - G_CALLBACK(enterMaxCellSize), - (gpointer)entry_maxCellSize - ); - + + gtk_entry_set_text + ( + GTK_ENTRY(entry_maxCellSize), + help::scalarToText(meshGui_.maxCellSize()).c_str() + ); + + g_signal_connect + ( + G_OBJECT(entry_maxCellSize), "changed", + G_CALLBACK(enterMaxCellSize), + (gpointer)entry_maxCellSize + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- horizontal separator - GtkWidget* hseparator0 = gtk_hseparator_new(); - gtk_widget_show(hseparator0); - gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 2, 3, + //- horizontal separator + GtkWidget* hseparator0 = gtk_hseparator_new(); + gtk_widget_show(hseparator0); + gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 2, 3, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); - + 0, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // //- boundary cell size - //- checkbutton for boundaryCellSize - GtkWidget* checkbutton_boundaryCellSize = - gtk_check_button_new_with_mnemonic - ( - "Use different size for boundary cells" - ); - gtk_widget_show(checkbutton_boundaryCellSize); - gtk_table_attach(GTK_TABLE(table1), - checkbutton_boundaryCellSize, 0, 5, 3, 4, + //- checkbutton for boundaryCellSize + GtkWidget* checkbutton_boundaryCellSize = + gtk_check_button_new_with_mnemonic + ( + "Use different size for boundary cells" + ); + gtk_widget_show(checkbutton_boundaryCellSize); + gtk_table_attach(GTK_TABLE(table1), + checkbutton_boundaryCellSize, 0, 5, 3, 4, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 1, 0); - - //- add callbacks for the button - if( meshGui_.boundaryCellSizeEntryExist() ) - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_boundaryCellSize), - 1 - ); - } - else - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_boundaryCellSize), - 0 - ); - } - - g_signal_connect - ( - gpointer(checkbutton_boundaryCellSize), - "clicked", - G_CALLBACK(useButtonCallback), - (gpointer)"UseBndSize" - ); + + //- add callbacks for the button + if( meshGui_.boundaryCellSizeEntryExist() ) + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_boundaryCellSize), + 1 + ); + } + else + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_boundaryCellSize), + 0 + ); + } + + g_signal_connect + ( + gpointer(checkbutton_boundaryCellSize), + "clicked", + G_CALLBACK(useButtonCallback), + (gpointer)"UseBndSize" + ); -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a box for boundary cell size - GtkWidget* label_boundaryCellSize = gtk_label_new("Boundary cell size [m]"); - gtk_widget_show(label_boundaryCellSize); - gtk_table_attach(GTK_TABLE(table1), label_boundaryCellSize, 1, 2, 4, 5, +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + //- create a box for boundary cell size + GtkWidget* label_boundaryCellSize = gtk_label_new("Boundary cell size [m]"); + gtk_widget_show(label_boundaryCellSize); + gtk_table_attach(GTK_TABLE(table1), label_boundaryCellSize, 1, 2, 4, 5, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_boundaryCellSize), 0, 0.5); - - GtkWidget* entry_boundaryCellSize = gtk_entry_new(); - gtk_widget_show(entry_boundaryCellSize); - gtk_table_attach(GTK_TABLE (table1), entry_boundaryCellSize, 3, 5, 4, 5, + gtk_misc_set_alignment(GTK_MISC(label_boundaryCellSize), 0, 0.5); + + GtkWidget* entry_boundaryCellSize = gtk_entry_new(); + gtk_widget_show(entry_boundaryCellSize); + gtk_table_attach(GTK_TABLE (table1), entry_boundaryCellSize, 3, 5, 4, 5, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 1, 0); - gtk_entry_set_invisible_char (GTK_ENTRY (entry_boundaryCellSize), 9679); - - gtk_entry_set_visibility - ( - GTK_ENTRY(entry_boundaryCellSize), - meshGui_.boundaryCellSizeEntryExist() - ); - - if( meshGui_.boundaryCellSizeEntryExist() ) - { - gtk_entry_set_text - ( - GTK_ENTRY(entry_boundaryCellSize), - help::scalarToText(meshGui_.boundaryCellSize()).c_str() - ); - } - else - { - gtk_editable_set_editable(GTK_EDITABLE(entry_boundaryCellSize), 0); - } - - g_signal_connect - ( - G_OBJECT(checkbutton_boundaryCellSize), - "toggled", - G_CALLBACK(editableEntry), - (gpointer)entry_boundaryCellSize - ); - - g_signal_connect - ( - G_OBJECT(entry_boundaryCellSize), - "changed", - G_CALLBACK(enterBndCellSize), - (gpointer)entry_boundaryCellSize - ); - + gtk_entry_set_invisible_char (GTK_ENTRY (entry_boundaryCellSize), 9679); + + gtk_entry_set_visibility + ( + GTK_ENTRY(entry_boundaryCellSize), + meshGui_.boundaryCellSizeEntryExist() + ); + + if( meshGui_.boundaryCellSizeEntryExist() ) + { + gtk_entry_set_text + ( + GTK_ENTRY(entry_boundaryCellSize), + help::scalarToText(meshGui_.boundaryCellSize()).c_str() + ); + } + else + { + gtk_editable_set_editable(GTK_EDITABLE(entry_boundaryCellSize), 0); + } + + g_signal_connect + ( + G_OBJECT(checkbutton_boundaryCellSize), + "toggled", + G_CALLBACK(editableEntry), + (gpointer)entry_boundaryCellSize + ); + + g_signal_connect + ( + G_OBJECT(entry_boundaryCellSize), + "changed", + G_CALLBACK(enterBndCellSize), + (gpointer)entry_boundaryCellSize + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- horizontal separator - GtkWidget* hseparator1 = gtk_hseparator_new(); - gtk_widget_show(hseparator1); - gtk_table_attach(GTK_TABLE(table1), hseparator1, 0, 5, 5, 6, + //- horizontal separator + GtkWidget* hseparator1 = gtk_hseparator_new(); + gtk_widget_show(hseparator1); + gtk_table_attach(GTK_TABLE(table1), hseparator1, 0, 5, 5, 6, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); - + 0, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a box for automatic refinement - - //- checkbox for automatic refinement - GtkWidget* checkbutton_automaticRefinement = - gtk_check_button_new_with_mnemonic("Use automatic refinement"); - gtk_widget_show(checkbutton_automaticRefinement); - gtk_table_attach(GTK_TABLE(table1), checkbutton_automaticRefinement, - 0, 5, 6, 7, + //- create a box for automatic refinement + + //- checkbox for automatic refinement + GtkWidget* checkbutton_automaticRefinement = + gtk_check_button_new_with_mnemonic("Use automatic refinement"); + gtk_widget_show(checkbutton_automaticRefinement); + gtk_table_attach(GTK_TABLE(table1), checkbutton_automaticRefinement, + 0, 5, 6, 7, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - if( meshGui_.minCellSizeEntryExist() ) - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_automaticRefinement), 1 - ); - } - else - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_automaticRefinement), 0 - ); - } - - g_signal_connect - ( - gpointer(checkbutton_automaticRefinement), - "clicked", - G_CALLBACK(useButtonCallback), - (gpointer)"UseAutoRef" - ); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a box for min cell size - GtkWidget* label_minCellSize = gtk_label_new("Min cell size [m]"); - gtk_widget_show(label_minCellSize); - gtk_table_attach(GTK_TABLE(table1), label_minCellSize, 1, 2, 7, 8, + + if( meshGui_.minCellSizeEntryExist() ) + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_automaticRefinement), 1 + ); + } + else + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_automaticRefinement), 0 + ); + } + + g_signal_connect + ( + gpointer(checkbutton_automaticRefinement), + "clicked", + G_CALLBACK(useButtonCallback), + (gpointer)"UseAutoRef" + ); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + //- create a box for min cell size + GtkWidget* label_minCellSize = gtk_label_new("Min cell size [m]"); + gtk_widget_show(label_minCellSize); + gtk_table_attach(GTK_TABLE(table1), label_minCellSize, 1, 2, 7, 8, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label_minCellSize), 0, 0.5); - - GtkWidget* entry_minCellSize = gtk_entry_new(); - gtk_widget_show(entry_minCellSize); - gtk_table_attach(GTK_TABLE (table1), entry_minCellSize, 3, 5, 7, 8, + gtk_misc_set_alignment (GTK_MISC (label_minCellSize), 0, 0.5); + + GtkWidget* entry_minCellSize = gtk_entry_new(); + gtk_widget_show(entry_minCellSize); + gtk_table_attach(GTK_TABLE (table1), entry_minCellSize, 3, 5, 7, 8, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 1, 0); - - if( meshGui_.minCellSizeEntryExist() ) - { - gtk_entry_set_text - ( - GTK_ENTRY(entry_minCellSize), - help::scalarToText(meshGui_.minCellSize()).c_str() - ); - } - else - { - gtk_editable_set_editable(GTK_EDITABLE(entry_minCellSize), 0); - } - - g_signal_connect - ( - G_OBJECT(checkbutton_automaticRefinement), - "toggled", - G_CALLBACK(editableEntry), - (gpointer)entry_minCellSize - ); - - g_signal_connect - ( - G_OBJECT(entry_minCellSize), - "changed", - G_CALLBACK(enterMinCellSize), - (gpointer)entry_minCellSize - ); - + + if( meshGui_.minCellSizeEntryExist() ) + { + gtk_entry_set_text + ( + GTK_ENTRY(entry_minCellSize), + help::scalarToText(meshGui_.minCellSize()).c_str() + ); + } + else + { + gtk_editable_set_editable(GTK_EDITABLE(entry_minCellSize), 0); + } + + g_signal_connect + ( + G_OBJECT(checkbutton_automaticRefinement), + "toggled", + G_CALLBACK(editableEntry), + (gpointer)entry_minCellSize + ); + + g_signal_connect + ( + G_OBJECT(entry_minCellSize), + "changed", + G_CALLBACK(enterMinCellSize), + (gpointer)entry_minCellSize + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- horizontal separator - GtkWidget* hseparator2 = gtk_hseparator_new(); - gtk_widget_show(hseparator2); - gtk_table_attach(GTK_TABLE(table1), hseparator2, 0, 5, 8, 9, + //- horizontal separator + GtkWidget* hseparator2 = gtk_hseparator_new(); + gtk_widget_show(hseparator2); + gtk_table_attach(GTK_TABLE(table1), hseparator2, 0, 5, 8, 9, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); - + 0, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- activate keepCellsIntersectingBoundary option - GtkWidget* checkbutton_keepCellsIntersectingBoundary = - gtk_check_button_new_with_mnemonic - ( - "Keep octree boxes intersecting the boundary" - ); - gtk_widget_show(checkbutton_keepCellsIntersectingBoundary); - gtk_table_attach(GTK_TABLE(table1), - checkbutton_keepCellsIntersectingBoundary, - 0, 5, 9, 10, + //- activate keepCellsIntersectingBoundary option + GtkWidget* checkbutton_keepCellsIntersectingBoundary = + gtk_check_button_new_with_mnemonic + ( + "Keep octree boxes intersecting the boundary" + ); + gtk_widget_show(checkbutton_keepCellsIntersectingBoundary); + gtk_table_attach(GTK_TABLE(table1), + checkbutton_keepCellsIntersectingBoundary, + 0, 5, 9, 10, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - if( meshGui_.keepCellsIntersectingBoundaryEntryExist() ) - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_keepCellsIntersectingBoundary) - ,1 - ); - } - else - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_keepCellsIntersectingBoundary) - ,0 - ); - } - - g_signal_connect - ( - gpointer(checkbutton_keepCellsIntersectingBoundary), - "clicked", - G_CALLBACK(useButtonCallback), - (gpointer)"UseKeepCellsIntersectingBoundary" - ); - + + if( meshGui_.keepCellsIntersectingBoundaryEntryExist() ) + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_keepCellsIntersectingBoundary) + ,1 + ); + } + else + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_keepCellsIntersectingBoundary) + ,0 + ); + } + + g_signal_connect + ( + gpointer(checkbutton_keepCellsIntersectingBoundary), + "clicked", + G_CALLBACK(useButtonCallback), + (gpointer)"UseKeepCellsIntersectingBoundary" + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- activate checkForGluedMesh - GtkWidget* checkbutton_checkForGluedMesh = - gtk_check_button_new_with_mnemonic("Remove invalid mesh connections"); - gtk_widget_show(checkbutton_checkForGluedMesh); - gtk_table_attach(GTK_TABLE(table1), checkbutton_checkForGluedMesh, - 0, 5, 10, 11, + //- activate checkForGluedMesh + GtkWidget* checkbutton_checkForGluedMesh = + gtk_check_button_new_with_mnemonic("Remove invalid mesh connections"); + gtk_widget_show(checkbutton_checkForGluedMesh); + gtk_table_attach(GTK_TABLE(table1), checkbutton_checkForGluedMesh, + 0, 5, 10, 11, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - if( !meshGui_.keepCellsIntersectingBoundary() ) - meshGui_.removeCheckForGluedMesh(); - - if( meshGui_.checkForGluedMesh() ) - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_checkForGluedMesh), - 1 - ); - } - else - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_checkForGluedMesh), - 0 - ); - } - - g_signal_connect - ( - gpointer(checkbutton_checkForGluedMesh), - "clicked", - G_CALLBACK(useButtonCallback), - (gpointer)"UseCheckForGluedMesh" - ); - + + if( !meshGui_.keepCellsIntersectingBoundary() ) + meshGui_.removeCheckForGluedMesh(); + + if( meshGui_.checkForGluedMesh() ) + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_checkForGluedMesh), + 1 + ); + } + else + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_checkForGluedMesh), + 0 + ); + } + + g_signal_connect + ( + gpointer(checkbutton_checkForGluedMesh), + "clicked", + G_CALLBACK(useButtonCallback), + (gpointer)"UseCheckForGluedMesh" + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - generalPageFramePtr_, - generalPageFramePtr_, - "window_generalPage_" - ); - GLADE_HOOKUP_OBJECT - ( - checkbutton_keepCellsIntersectingBoundary, - checkbutton_checkForGluedMesh, - "checkbutton_checkForGluedMesh" - ); - - gtk_widget_show(generalPageFramePtr_); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + generalPageFramePtr_, + generalPageFramePtr_, + "window_generalPage_" + ); + GLADE_HOOKUP_OBJECT + ( + checkbutton_keepCellsIntersectingBoundary, + checkbutton_checkForGluedMesh, + "checkbutton_checkForGluedMesh" + ); + + gtk_widget_show(generalPageFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKKeepCellsIntersectingPatches.C b/GUI/meshGenGTK/meshGenGTKKeepCellsIntersectingPatches.C index d14adbc..10e6c47 100644 --- a/GUI/meshGenGTK/meshGenGTKKeepCellsIntersectingPatches.C +++ b/GUI/meshGenGTK/meshGenGTKKeepCellsIntersectingPatches.C @@ -37,374 +37,374 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // //- callback functions - + extern "C" { static void updateKeepCellsIntersectingPatches ( - GtkWidget* keepCellsIntersectingPatchesFramePtr + GtkWidget* keepCellsIntersectingPatchesFramePtr ) { - GtkWidget* comboboxentry_keepCellsIntersectingPatches_availablePatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(keepCellsIntersectingPatchesFramePtr), - "comboboxentry_keepCellsIntersectingPatches_availablePatches" - ); - GtkWidget* comboboxentry_keepCellsIntersectingPatches_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(keepCellsIntersectingPatchesFramePtr), - "comboboxentry_keepCellsIntersectingPatches_selectedPatches" - ); - //- update available patches - wordList alreadyUsed = guiPtr->keepCellsIntersectingPatches(); - wordHashSet usedNames; - forAll(alreadyUsed, nameI) - usedNames.insert(alreadyUsed[nameI]); - - GList* avPatches = 0; - label nAvailable(0); - const triSurface& surf = guiPtr->surface(); - forAll(surf.patches(), patchI) - { - if( usedNames.found(surf.patches()[patchI].name()) ) - continue; - const char* name = surf.patches()[patchI].name().c_str(); - avPatches = g_list_append(avPatches, const_cast(name)); - ++nAvailable; - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_keepCellsIntersectingPatches_availablePatches - ), avPatches - ); - - if( nAvailable == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_keepCellsIntersectingPatches_availablePatches - )->entry - ), "" - ); - } - - //- update used patches - GList* selPatches = 0; - forAll(alreadyUsed, patchI) - { - const char* name = alreadyUsed[patchI].c_str(); - selPatches = g_list_append(selPatches, const_cast(name)); - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_keepCellsIntersectingPatches_selectedPatches - ), selPatches - ); - - if( alreadyUsed.size() == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_keepCellsIntersectingPatches_selectedPatches - )->entry - ), "" - ); - } - - g_list_free(avPatches); - g_list_free(selPatches); + GtkWidget* comboboxentry_keepCellsIntersectingPatches_availablePatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(keepCellsIntersectingPatchesFramePtr), + "comboboxentry_keepCellsIntersectingPatches_availablePatches" + ); + GtkWidget* comboboxentry_keepCellsIntersectingPatches_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(keepCellsIntersectingPatchesFramePtr), + "comboboxentry_keepCellsIntersectingPatches_selectedPatches" + ); + //- update available patches + wordList alreadyUsed = guiPtr->keepCellsIntersectingPatches(); + wordHashSet usedNames; + forAll(alreadyUsed, nameI) + usedNames.insert(alreadyUsed[nameI]); + + GList* avPatches = 0; + label nAvailable(0); + const triSurface& surf = guiPtr->surface(); + forAll(surf.patches(), patchI) + { + if( usedNames.found(surf.patches()[patchI].name()) ) + continue; + const char* name = surf.patches()[patchI].name().c_str(); + avPatches = g_list_append(avPatches, const_cast(name)); + ++nAvailable; + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_keepCellsIntersectingPatches_availablePatches + ), avPatches + ); + + if( nAvailable == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_keepCellsIntersectingPatches_availablePatches + )->entry + ), "" + ); + } + + //- update used patches + GList* selPatches = 0; + forAll(alreadyUsed, patchI) + { + const char* name = alreadyUsed[patchI].c_str(); + selPatches = g_list_append(selPatches, const_cast(name)); + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_keepCellsIntersectingPatches_selectedPatches + ), selPatches + ); + + if( alreadyUsed.size() == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_keepCellsIntersectingPatches_selectedPatches + )->entry + ), "" + ); + } + + g_list_free(avPatches); + g_list_free(selPatches); } - + static void addKeepCellsIntersectingPatches ( - GtkWidget* widget, - GtkWidget* keepCellsIntersectingPatchesFramePtr + GtkWidget* widget, + GtkWidget* keepCellsIntersectingPatchesFramePtr ) { - GtkWidget* comboboxentry_keepCellsIntersectingPatches_availablePatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(keepCellsIntersectingPatchesFramePtr), - "comboboxentry_keepCellsIntersectingPatches_availablePatches" - ); - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_keepCellsIntersectingPatches_availablePatches - )->entry - ) - ); - - if( name == "" ) - return; - - guiPtr->addKeepCellsIntersectingPatches(name); - - updateKeepCellsIntersectingPatches(keepCellsIntersectingPatchesFramePtr); + GtkWidget* comboboxentry_keepCellsIntersectingPatches_availablePatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(keepCellsIntersectingPatchesFramePtr), + "comboboxentry_keepCellsIntersectingPatches_availablePatches" + ); + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_keepCellsIntersectingPatches_availablePatches + )->entry + ) + ); + + if( name == "" ) + return; + + guiPtr->addKeepCellsIntersectingPatches(name); + + updateKeepCellsIntersectingPatches(keepCellsIntersectingPatchesFramePtr); } static void removeKeepCellsIntersectingPatches ( - GtkWidget* widget, - GtkWidget* keepCellsIntersectingPatchesFramePtr + GtkWidget* widget, + GtkWidget* keepCellsIntersectingPatchesFramePtr ) { - GtkWidget* comboboxentry_keepCellsIntersectingPatches_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(keepCellsIntersectingPatchesFramePtr), - "comboboxentry_keepCellsIntersectingPatches_selectedPatches" - ); - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_keepCellsIntersectingPatches_selectedPatches - )->entry - ) - ); - - if( name == "" ) - return; - - guiPtr->removeKeepCellsIntersectingPatches(name); - - updateKeepCellsIntersectingPatches(keepCellsIntersectingPatchesFramePtr); + GtkWidget* comboboxentry_keepCellsIntersectingPatches_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(keepCellsIntersectingPatchesFramePtr), + "comboboxentry_keepCellsIntersectingPatches_selectedPatches" + ); + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_keepCellsIntersectingPatches_selectedPatches + )->entry + ) + ); + + if( name == "" ) + return; + + guiPtr->removeKeepCellsIntersectingPatches(name); + + updateKeepCellsIntersectingPatches(keepCellsIntersectingPatchesFramePtr); } } void meshGenGTK::createKeepCellsIntersectingPatchesWindowPage() { - guiPtr = &meshGui_; - - keepCellsIntersectingPatchesFramePtr_ = gtk_frame_new(NULL); + guiPtr = &meshGui_; + + keepCellsIntersectingPatchesFramePtr_ = gtk_frame_new(NULL); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a table - GtkWidget* table1 = gtk_table_new(2, 3, FALSE); - gtk_widget_show(table1); - gtk_container_add - ( - GTK_CONTAINER(keepCellsIntersectingPatchesFramePtr_), - table1 - ); + //- create a table + GtkWidget* table1 = gtk_table_new(2, 3, FALSE); + gtk_widget_show(table1); + gtk_container_add + ( + GTK_CONTAINER(keepCellsIntersectingPatchesFramePtr_), + table1 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set label for available patches - GtkWidget* label_keepCellsIntersectingPatches_availablePatches = - gtk_label_new("Available patches"); - gtk_widget_show(label_keepCellsIntersectingPatches_availablePatches); - gtk_table_attach - ( - GTK_TABLE(table1), - label_keepCellsIntersectingPatches_availablePatches, - 0, 1, 0, 1, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0 - ); - gtk_misc_set_alignment - ( - GTK_MISC(label_keepCellsIntersectingPatches_availablePatches), - 0, - 0.5 - ); - + //- set label for available patches + GtkWidget* label_keepCellsIntersectingPatches_availablePatches = + gtk_label_new("Available patches"); + gtk_widget_show(label_keepCellsIntersectingPatches_availablePatches); + gtk_table_attach + ( + GTK_TABLE(table1), + label_keepCellsIntersectingPatches_availablePatches, + 0, 1, 0, 1, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions) (0), 0, 0 + ); + gtk_misc_set_alignment + ( + GTK_MISC(label_keepCellsIntersectingPatches_availablePatches), + 0, + 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create the combo box for available patches - GtkWidget* comboboxentry_keepCellsIntersectingPatches_availablePatches = - gtk_combo_new(); - gtk_widget_show - ( - comboboxentry_keepCellsIntersectingPatches_availablePatches - ); - gtk_table_attach - ( - GTK_TABLE(table1), - comboboxentry_keepCellsIntersectingPatches_availablePatches, - 1, 2, 0, 1, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), - (GtkAttachOptions)(GTK_FILL), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO - ( - comboboxentry_keepCellsIntersectingPatches_availablePatches - )->entry - ), - 0 - ); - + //- create the combo box for available patches + GtkWidget* comboboxentry_keepCellsIntersectingPatches_availablePatches = + gtk_combo_new(); + gtk_widget_show + ( + comboboxentry_keepCellsIntersectingPatches_availablePatches + ); + gtk_table_attach + ( + GTK_TABLE(table1), + comboboxentry_keepCellsIntersectingPatches_availablePatches, + 1, 2, 0, 1, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(GTK_FILL), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO + ( + comboboxentry_keepCellsIntersectingPatches_availablePatches + )->entry + ), + 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for adding patches - GtkWidget* button1 = gtk_button_new(); - gtk_widget_show(button1); - gtk_table_attach - ( - GTK_TABLE(table1), - button1, - 2, 3, 0, 1, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - - g_signal_connect - ( - G_OBJECT(button1), - "clicked", - G_CALLBACK(addKeepCellsIntersectingPatches), - keepCellsIntersectingPatchesFramePtr_ - ); + //- set the button for adding patches + GtkWidget* button1 = gtk_button_new(); + gtk_widget_show(button1); + gtk_table_attach + ( + GTK_TABLE(table1), + button1, + 2, 3, 0, 1, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + + g_signal_connect + ( + G_OBJECT(button1), + "clicked", + G_CALLBACK(addKeepCellsIntersectingPatches), + keepCellsIntersectingPatchesFramePtr_ + ); - GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(button1), alignment1); - - GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox1); - gtk_container_add(GTK_CONTAINER(alignment1), hbox1); - - GtkWidget* image1 = - gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); - - GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); - gtk_widget_show(label3); - gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); - + GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(button1), alignment1); + + GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox1); + gtk_container_add(GTK_CONTAINER(alignment1), hbox1); + + GtkWidget* image1 = + gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); + + GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); + gtk_widget_show(label3); + gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set label for selected patches - GtkWidget* label_keepCellsIntersectingPatches_selectedPatches = - gtk_label_new("Selected patches"); - gtk_widget_show(label_keepCellsIntersectingPatches_selectedPatches); - gtk_table_attach - ( - GTK_TABLE(table1), - label_keepCellsIntersectingPatches_selectedPatches, - 0, 1, 1, 2, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - gtk_misc_set_alignment - ( - GTK_MISC(label_keepCellsIntersectingPatches_selectedPatches), - 0, - 0.5 - ); - + //- set label for selected patches + GtkWidget* label_keepCellsIntersectingPatches_selectedPatches = + gtk_label_new("Selected patches"); + gtk_widget_show(label_keepCellsIntersectingPatches_selectedPatches); + gtk_table_attach + ( + GTK_TABLE(table1), + label_keepCellsIntersectingPatches_selectedPatches, + 0, 1, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + gtk_misc_set_alignment + ( + GTK_MISC(label_keepCellsIntersectingPatches_selectedPatches), + 0, + 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create the combo box for selected patches - GtkWidget* comboboxentry_keepCellsIntersectingPatches_selectedPatches = - gtk_combo_new(); - gtk_widget_show(comboboxentry_keepCellsIntersectingPatches_selectedPatches); - gtk_table_attach - ( - GTK_TABLE(table1), - comboboxentry_keepCellsIntersectingPatches_selectedPatches, - 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO - ( - comboboxentry_keepCellsIntersectingPatches_selectedPatches - )->entry - ), - 0 - ); - + //- create the combo box for selected patches + GtkWidget* comboboxentry_keepCellsIntersectingPatches_selectedPatches = + gtk_combo_new(); + gtk_widget_show(comboboxentry_keepCellsIntersectingPatches_selectedPatches); + gtk_table_attach + ( + GTK_TABLE(table1), + comboboxentry_keepCellsIntersectingPatches_selectedPatches, + 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO + ( + comboboxentry_keepCellsIntersectingPatches_selectedPatches + )->entry + ), + 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for removing patches - GtkWidget* button2 = gtk_button_new(); - gtk_widget_show(button2); - gtk_table_attach - ( - GTK_TABLE(table1), - button2, - 2, 3, 1, 2, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - - g_signal_connect - ( - G_OBJECT(button2), - "clicked", - G_CALLBACK(removeKeepCellsIntersectingPatches), - keepCellsIntersectingPatchesFramePtr_ - ); - - GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment2); - gtk_container_add(GTK_CONTAINER(button2), alignment2); - - GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox2); - gtk_container_add(GTK_CONTAINER(alignment2), hbox2); - - GtkWidget* image2 = - gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image2); - gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); - - GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); - + //- set the button for removing patches + GtkWidget* button2 = gtk_button_new(); + gtk_widget_show(button2); + gtk_table_attach + ( + GTK_TABLE(table1), + button2, + 2, 3, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + + g_signal_connect + ( + G_OBJECT(button2), + "clicked", + G_CALLBACK(removeKeepCellsIntersectingPatches), + keepCellsIntersectingPatchesFramePtr_ + ); + + GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment2); + gtk_container_add(GTK_CONTAINER(button2), alignment2); + + GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox2); + gtk_container_add(GTK_CONTAINER(alignment2), hbox2); + + GtkWidget* image2 = + gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image2); + gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); + + GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); + gtk_widget_show(label5); + gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - keepCellsIntersectingPatchesFramePtr_, - keepCellsIntersectingPatchesFramePtr_, - "Cell intersecting patches frame" - ); - GLADE_HOOKUP_OBJECT - ( - keepCellsIntersectingPatchesFramePtr_, - comboboxentry_keepCellsIntersectingPatches_availablePatches, - "comboboxentry_keepCellsIntersectingPatches_availablePatches" - ); - GLADE_HOOKUP_OBJECT - ( - keepCellsIntersectingPatchesFramePtr_, - comboboxentry_keepCellsIntersectingPatches_selectedPatches, - "comboboxentry_keepCellsIntersectingPatches_selectedPatches" - ); - - updateKeepCellsIntersectingPatches(keepCellsIntersectingPatchesFramePtr_); - - gtk_widget_show(keepCellsIntersectingPatchesFramePtr_); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + keepCellsIntersectingPatchesFramePtr_, + keepCellsIntersectingPatchesFramePtr_, + "Cell intersecting patches frame" + ); + GLADE_HOOKUP_OBJECT + ( + keepCellsIntersectingPatchesFramePtr_, + comboboxentry_keepCellsIntersectingPatches_availablePatches, + "comboboxentry_keepCellsIntersectingPatches_availablePatches" + ); + GLADE_HOOKUP_OBJECT + ( + keepCellsIntersectingPatchesFramePtr_, + comboboxentry_keepCellsIntersectingPatches_selectedPatches, + "comboboxentry_keepCellsIntersectingPatches_selectedPatches" + ); + + updateKeepCellsIntersectingPatches(keepCellsIntersectingPatchesFramePtr_); + + gtk_widget_show(keepCellsIntersectingPatchesFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKLineRefinement.C b/GUI/meshGenGTK/meshGenGTKLineRefinement.C index ee07cc2..e6c42ff 100644 --- a/GUI/meshGenGTK/meshGenGTKLineRefinement.C +++ b/GUI/meshGenGTK/meshGenGTKLineRefinement.C @@ -43,1008 +43,1008 @@ extern "C" static void showDataForLineRefinement ( - GtkWidget* widget, - GtkWidget* lineRefinementFramePtr + GtkWidget* widget, + GtkWidget* lineRefinementFramePtr ) { - GtkWidget* comboboxentry_lineRefinement_createdLines = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "comboboxentry_lineRefinement_createdLines" - ); - GtkWidget* entry_lineRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedCellSize" - ); - GtkWidget* entry_lineRefinement_selectedP0X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP0X" - ); - GtkWidget* entry_lineRefinement_selectedP0Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP0Y" - ); - GtkWidget* entry_lineRefinement_selectedP0Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP0Z" - ); - GtkWidget* entry_lineRefinement_selectedP1X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP1X" - ); - GtkWidget* entry_lineRefinement_selectedP1Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP1Y" - ); - GtkWidget* entry_lineRefinement_selectedP1Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP1Z" - ); - - //- find the object in the dictionary - const word lineName = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_lineRefinement_createdLines)->entry - ) - ); - - const PtrList refs = guiPtr->objectRefinements(); - - forAll(refs, refI) - if( refs[refI].keyword() == lineName ) - { - const dictionary dict = refs[refI].dict(); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_lineRefinement_selectedCellSize), - help::scalarToText - ( - scalar(readScalar(dict.lookup("cellSize"))) - ).c_str() - ); - const vector p0(dict.lookup("p0")); - gtk_entry_set_text - ( - GTK_ENTRY(entry_lineRefinement_selectedP0X), - help::scalarToText(p0.x()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_lineRefinement_selectedP0Y), - help::scalarToText(p0.y()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_lineRefinement_selectedP0Z), - help::scalarToText(p0.z()).c_str() - ); - - const vector p1(dict.lookup("p1")); - gtk_entry_set_text - ( - GTK_ENTRY(entry_lineRefinement_selectedP1X), - help::scalarToText(p1.x()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_lineRefinement_selectedP1Y), - help::scalarToText(p1.y()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_lineRefinement_selectedP1Z), - help::scalarToText(p1.z()).c_str() - ); - - return; - } - - gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedCellSize), ""); - gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP0X), ""); - gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP0Y), ""); - gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP0Z), ""); - gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP1X), ""); - gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP1Y), ""); - gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP1Z), ""); + GtkWidget* comboboxentry_lineRefinement_createdLines = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "comboboxentry_lineRefinement_createdLines" + ); + GtkWidget* entry_lineRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedCellSize" + ); + GtkWidget* entry_lineRefinement_selectedP0X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP0X" + ); + GtkWidget* entry_lineRefinement_selectedP0Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP0Y" + ); + GtkWidget* entry_lineRefinement_selectedP0Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP0Z" + ); + GtkWidget* entry_lineRefinement_selectedP1X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP1X" + ); + GtkWidget* entry_lineRefinement_selectedP1Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP1Y" + ); + GtkWidget* entry_lineRefinement_selectedP1Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP1Z" + ); + + //- find the object in the dictionary + const word lineName = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_lineRefinement_createdLines)->entry + ) + ); + + const PtrList refs = guiPtr->objectRefinements(); + + forAll(refs, refI) + if( refs[refI].keyword() == lineName ) + { + const dictionary dict = refs[refI].dict(); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_lineRefinement_selectedCellSize), + help::scalarToText + ( + scalar(readScalar(dict.lookup("cellSize"))) + ).c_str() + ); + const vector p0(dict.lookup("p0")); + gtk_entry_set_text + ( + GTK_ENTRY(entry_lineRefinement_selectedP0X), + help::scalarToText(p0.x()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_lineRefinement_selectedP0Y), + help::scalarToText(p0.y()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_lineRefinement_selectedP0Z), + help::scalarToText(p0.z()).c_str() + ); + + const vector p1(dict.lookup("p1")); + gtk_entry_set_text + ( + GTK_ENTRY(entry_lineRefinement_selectedP1X), + help::scalarToText(p1.x()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_lineRefinement_selectedP1Y), + help::scalarToText(p1.y()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_lineRefinement_selectedP1Z), + help::scalarToText(p1.z()).c_str() + ); + + return; + } + + gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedCellSize), ""); + gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP0X), ""); + gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP0Y), ""); + gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP0Z), ""); + gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP1X), ""); + gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP1Y), ""); + gtk_entry_set_text(GTK_ENTRY(entry_lineRefinement_selectedP1Z), ""); } static void resetValuesForSelectedLine ( - GtkWidget* widget, - GtkWidget* lineRefinementFramePtr + GtkWidget* widget, + GtkWidget* lineRefinementFramePtr ) { - GtkWidget* comboboxentry_lineRefinement_createdLines = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "comboboxentry_lineRefinement_createdLines" - ); - GtkWidget* entry_lineRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedCellSize" - ); - GtkWidget* entry_lineRefinement_selectedP0X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP0X" - ); - GtkWidget* entry_lineRefinement_selectedP0Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP0Y" - ); - GtkWidget* entry_lineRefinement_selectedP0Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP0Z" - ); - GtkWidget* entry_lineRefinement_selectedP1X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP1X" - ); - GtkWidget* entry_lineRefinement_selectedP1Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP1Y" - ); - GtkWidget* entry_lineRefinement_selectedP1Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_selectedP1Z" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_lineRefinement_createdLines - )->entry - ) - ); - - if( name == "" ) - return; - - const PtrList refs = guiPtr->objectRefinements(); - dictionary dict; - forAll(refs, refI) - if( refs[refI].keyword() == name ) - dict = refs[refI].dict(); - guiPtr->removeObjectRefinement(name); - if( widget == entry_lineRefinement_selectedCellSize ) - { - const word size = - gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedCellSize)); - dict.remove("cellSize"); - dict.add("cellSize", help::textToScalar(size)); - } - else if( widget == entry_lineRefinement_selectedP0X ) - { - point p0(dict.lookup("p0")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP0X)); - dict.remove("p0"); - p0.x() = help::textToScalar(c); - dict.add("p0", p0); - } - else if( widget == entry_lineRefinement_selectedP0Y ) - { - point p0(dict.lookup("p0")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP0Y)); - dict.remove("p0"); - p0.y() = help::textToScalar(c); - dict.add("p0", p0); - } - else if( widget == entry_lineRefinement_selectedP0Z ) - { - point p0(dict.lookup("p0")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP0Z)); - dict.remove("p0"); - p0.z() = help::textToScalar(c); - dict.add("p0", p0); - } - else if( widget == entry_lineRefinement_selectedP1X ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP1X)); - point p1(dict.lookup("p1")); - dict.remove("p1"); - p1.x() = help::textToScalar(l); - dict.add("p1", p1); - } - else if( widget == entry_lineRefinement_selectedP1Y ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP1Y)); - point p1(dict.lookup("p1")); - dict.remove("p1"); - p1.y() = help::textToScalar(l); - dict.add("p1", p1); - } - else if( widget == entry_lineRefinement_selectedP1Z ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP1Z)); - point p1(dict.lookup("p1")); - dict.remove("p1"); - p1.z() = help::textToScalar(l); - dict.add("p1", p1); - } - - lineRefinement br(name, dict); - guiPtr->addObjectRefinement(br); + GtkWidget* comboboxentry_lineRefinement_createdLines = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "comboboxentry_lineRefinement_createdLines" + ); + GtkWidget* entry_lineRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedCellSize" + ); + GtkWidget* entry_lineRefinement_selectedP0X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP0X" + ); + GtkWidget* entry_lineRefinement_selectedP0Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP0Y" + ); + GtkWidget* entry_lineRefinement_selectedP0Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP0Z" + ); + GtkWidget* entry_lineRefinement_selectedP1X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP1X" + ); + GtkWidget* entry_lineRefinement_selectedP1Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP1Y" + ); + GtkWidget* entry_lineRefinement_selectedP1Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_selectedP1Z" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_lineRefinement_createdLines + )->entry + ) + ); + + if( name == "" ) + return; + + const PtrList refs = guiPtr->objectRefinements(); + dictionary dict; + forAll(refs, refI) + if( refs[refI].keyword() == name ) + dict = refs[refI].dict(); + guiPtr->removeObjectRefinement(name); + if( widget == entry_lineRefinement_selectedCellSize ) + { + const word size = + gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedCellSize)); + dict.remove("cellSize"); + dict.add("cellSize", help::textToScalar(size)); + } + else if( widget == entry_lineRefinement_selectedP0X ) + { + point p0(dict.lookup("p0")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP0X)); + dict.remove("p0"); + p0.x() = help::textToScalar(c); + dict.add("p0", p0); + } + else if( widget == entry_lineRefinement_selectedP0Y ) + { + point p0(dict.lookup("p0")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP0Y)); + dict.remove("p0"); + p0.y() = help::textToScalar(c); + dict.add("p0", p0); + } + else if( widget == entry_lineRefinement_selectedP0Z ) + { + point p0(dict.lookup("p0")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP0Z)); + dict.remove("p0"); + p0.z() = help::textToScalar(c); + dict.add("p0", p0); + } + else if( widget == entry_lineRefinement_selectedP1X ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP1X)); + point p1(dict.lookup("p1")); + dict.remove("p1"); + p1.x() = help::textToScalar(l); + dict.add("p1", p1); + } + else if( widget == entry_lineRefinement_selectedP1Y ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP1Y)); + point p1(dict.lookup("p1")); + dict.remove("p1"); + p1.y() = help::textToScalar(l); + dict.add("p1", p1); + } + else if( widget == entry_lineRefinement_selectedP1Z ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_lineRefinement_selectedP1Z)); + point p1(dict.lookup("p1")); + dict.remove("p1"); + p1.z() = help::textToScalar(l); + dict.add("p1", p1); + } + + lineRefinement br(name, dict); + guiPtr->addObjectRefinement(br); } static void updateLineRefinements(GtkWidget* lineRefinementFramePtr) { - GtkWidget* comboboxentry_lineRefinement_createdLines = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "comboboxentry_lineRefinement_createdLines" - ); - - const PtrList refs = guiPtr->objectRefinements(); - label nLines(0); - GList* createdLines = 0; - forAll(refs, refI) - { - const word& key = refs[refI].keyword(); - const dictionary& dict = refs[refI].dict(); - const word type(dict.lookup("type")); - - if( type == "line" ) - { - ++nLines; - lineRefinement line(key, dict); - createdLines = - g_list_append - ( - createdLines, - const_cast(line.name().c_str()) - ); - } - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_lineRefinement_createdLines - ), createdLines - ); - - if( nLines == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_lineRefinement_createdLines)->entry - ), - "" - ); - } - - g_list_free(createdLines); - - showDataForLineRefinement(NULL, lineRefinementFramePtr); + GtkWidget* comboboxentry_lineRefinement_createdLines = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "comboboxentry_lineRefinement_createdLines" + ); + + const PtrList refs = guiPtr->objectRefinements(); + label nLines(0); + GList* createdLines = 0; + forAll(refs, refI) + { + const word& key = refs[refI].keyword(); + const dictionary& dict = refs[refI].dict(); + const word type(dict.lookup("type")); + + if( type == "line" ) + { + ++nLines; + lineRefinement line(key, dict); + createdLines = + g_list_append + ( + createdLines, + const_cast(line.name().c_str()) + ); + } + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_lineRefinement_createdLines + ), createdLines + ); + + if( nLines == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_lineRefinement_createdLines)->entry + ), + "" + ); + } + + g_list_free(createdLines); + + showDataForLineRefinement(NULL, lineRefinementFramePtr); } static void addLineRefinement ( - GtkWidget* button, - GtkWidget* lineRefinementFramePtr + GtkWidget* button, + GtkWidget* lineRefinementFramePtr ) { - GtkWidget* name = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineName" - ); - GtkWidget* cellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_cellSize" - ); - GtkWidget* p0X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_p0X" - ); - GtkWidget* p0Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_p0Y" - ); - GtkWidget* p0Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_p0Z" - ); - GtkWidget* p1X = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_p1X" - ); - GtkWidget* p1Y = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_p1Y" - ); - GtkWidget* p1Z = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "entry_lineRefinement_p1Z" - ); - - //- create all necessary settings - const word lineName = gtk_entry_get_text(GTK_ENTRY(name)); - gtk_entry_set_text(GTK_ENTRY(name), ""); - const scalar lineCellSize = - help::textToScalar(gtk_entry_get_text(GTK_ENTRY(cellSize))); - gtk_entry_set_text(GTK_ENTRY(cellSize), ""); - point p0, p1; - p0.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0X))); - gtk_entry_set_text(GTK_ENTRY(p0X), ""); - p0.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0Y))); - gtk_entry_set_text(GTK_ENTRY(p0Y), ""); - p0.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0Z))); - gtk_entry_set_text(GTK_ENTRY(p0Z), ""); - p1.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1X))); - gtk_entry_set_text(GTK_ENTRY(p1X), ""); - p1.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1Y))); - gtk_entry_set_text(GTK_ENTRY(p1Y), ""); - p1.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1Z))); - gtk_entry_set_text(GTK_ENTRY(p1Z), ""); - - lineRefinement line - ( - lineName, - lineCellSize, - p0, - p1 - ); - - guiPtr->addObjectRefinement(line); - - updateLineRefinements(lineRefinementFramePtr); + GtkWidget* name = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineName" + ); + GtkWidget* cellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_cellSize" + ); + GtkWidget* p0X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_p0X" + ); + GtkWidget* p0Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_p0Y" + ); + GtkWidget* p0Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_p0Z" + ); + GtkWidget* p1X = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_p1X" + ); + GtkWidget* p1Y = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_p1Y" + ); + GtkWidget* p1Z = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "entry_lineRefinement_p1Z" + ); + + //- create all necessary settings + const word lineName = gtk_entry_get_text(GTK_ENTRY(name)); + gtk_entry_set_text(GTK_ENTRY(name), ""); + const scalar lineCellSize = + help::textToScalar(gtk_entry_get_text(GTK_ENTRY(cellSize))); + gtk_entry_set_text(GTK_ENTRY(cellSize), ""); + point p0, p1; + p0.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0X))); + gtk_entry_set_text(GTK_ENTRY(p0X), ""); + p0.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0Y))); + gtk_entry_set_text(GTK_ENTRY(p0Y), ""); + p0.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p0Z))); + gtk_entry_set_text(GTK_ENTRY(p0Z), ""); + p1.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1X))); + gtk_entry_set_text(GTK_ENTRY(p1X), ""); + p1.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1Y))); + gtk_entry_set_text(GTK_ENTRY(p1Y), ""); + p1.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(p1Z))); + gtk_entry_set_text(GTK_ENTRY(p1Z), ""); + + lineRefinement line + ( + lineName, + lineCellSize, + p0, + p1 + ); + + guiPtr->addObjectRefinement(line); + + updateLineRefinements(lineRefinementFramePtr); } static void removeLineRefinement ( - GtkWidget* button, - GtkWidget* lineRefinementFramePtr + GtkWidget* button, + GtkWidget* lineRefinementFramePtr ) { - GtkWidget* createdLines = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(lineRefinementFramePtr), - "comboboxentry_lineRefinement_createdLines" - ); - - const word lineName = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(createdLines)->entry - ) - ); + GtkWidget* createdLines = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(lineRefinementFramePtr), + "comboboxentry_lineRefinement_createdLines" + ); + + const word lineName = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(createdLines)->entry + ) + ); - guiPtr->removeObjectRefinement(lineName); + guiPtr->removeObjectRefinement(lineName); - updateLineRefinements(lineRefinementFramePtr); + updateLineRefinements(lineRefinementFramePtr); } } void meshGenGTK::createLineRefinementWindowPage() { - guiPtr = &meshGui_; - - lineRefinementFramePtr_ = gtk_frame_new(NULL); + guiPtr = &meshGui_; + + lineRefinementFramePtr_ = gtk_frame_new(NULL); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a table - GtkWidget* table1 = gtk_table_new(5, 11, FALSE); - gtk_widget_show(table1); - gtk_container_add - ( - GTK_CONTAINER(lineRefinementFramePtr_), - table1 - ); + //- create a table + GtkWidget* table1 = gtk_table_new(5, 11, FALSE); + gtk_widget_show(table1); + gtk_container_add + ( + GTK_CONTAINER(lineRefinementFramePtr_), + table1 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for box name - GtkWidget* label_lineName = gtk_label_new("Line name"); - gtk_widget_show(label_lineName); - gtk_table_attach(GTK_TABLE(table1), label_lineName, 0, 1, 0, 1, + //- create a label for box name + GtkWidget* label_lineName = gtk_label_new("Line name"); + gtk_widget_show(label_lineName); + gtk_table_attach(GTK_TABLE(table1), label_lineName, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_lineName), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_lineName), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create an entry for box name - GtkWidget* entry_lineName = gtk_entry_new(); - gtk_widget_show(entry_lineName); - - gtk_table_attach(GTK_TABLE(table1), entry_lineName, 1, 4, 0, 1, - (GtkAttachOptions)(GTK_FILL), + //- create an entry for box name + GtkWidget* entry_lineName = gtk_entry_new(); + gtk_widget_show(entry_lineName); + + gtk_table_attach(GTK_TABLE(table1), entry_lineName, 1, 4, 0, 1, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for desired cell size - GtkWidget* label_lineRefinement_cellSize = gtk_label_new("Cell size [m]"); - gtk_widget_show(label_lineRefinement_cellSize); - gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_cellSize, - 0, 1, 1, 2, - (GtkAttachOptions)(GTK_FILL), + //- create a label for desired cell size + GtkWidget* label_lineRefinement_cellSize = gtk_label_new("Cell size [m]"); + gtk_widget_show(label_lineRefinement_cellSize); + gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_cellSize, + 0, 1, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_lineRefinement_cellSize), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_lineRefinement_cellSize), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for desired cell size - GtkWidget* entry_lineRefinement_cellSize = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_cellSize); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_cellSize, - 1, 4, 1, 2, - (GtkAttachOptions)(GTK_FILL), + //- create a label for desired cell size + GtkWidget* entry_lineRefinement_cellSize = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_cellSize); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_cellSize, + 1, 4, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create labels for axes - GtkWidget* label_axes = gtk_label_new("X"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 1, 2, 2, 3, - (GtkAttachOptions)(GTK_FILL), + //- create labels for axes + GtkWidget* label_axes = gtk_label_new("X"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 1, 2, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Y"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 2, 3, 2, 3, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Y"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 2, 3, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Z"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 3, 4, 2, 3, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Z"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 3, 4, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for p0 - GtkWidget* label_lineRefinement_p0 = gtk_label_new("Starting point"); - gtk_widget_show(label_lineRefinement_p0); - gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_p0, - 0, 1, 3, 4, - (GtkAttachOptions)(GTK_FILL), + //- label for p0 + GtkWidget* label_lineRefinement_p0 = gtk_label_new("Starting point"); + gtk_widget_show(label_lineRefinement_p0); + gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_p0, + 0, 1, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_lineRefinement_p0), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_lineRefinement_p0), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for p0 - GtkWidget* entry_lineRefinement_p0X = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_p0X); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p0X, - 1, 2, 3, 4, - (GtkAttachOptions)(GTK_FILL), + //- entries for p0 + GtkWidget* entry_lineRefinement_p0X = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_p0X); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p0X, + 1, 2, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_lineRefinement_p0Y = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_p0Y); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p0Y, - 2, 3, 3, 4, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_lineRefinement_p0Y = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_p0Y); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p0Y, + 2, 3, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_lineRefinement_p0Z = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_p0Z); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p0Z, - 3, 4, 3, 4, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_lineRefinement_p0Z = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_p0Z); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p0Z, + 3, 4, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for p1 - GtkWidget* label_lineRefinement_p1 = gtk_label_new("End point"); - gtk_widget_show(label_lineRefinement_p1); - gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_p1, - 0, 1, 4, 5, - (GtkAttachOptions)(GTK_FILL), + //- label for p1 + GtkWidget* label_lineRefinement_p1 = gtk_label_new("End point"); + gtk_widget_show(label_lineRefinement_p1); + gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_p1, + 0, 1, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_lineRefinement_p1), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_lineRefinement_p1), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for p1 - GtkWidget* entry_lineRefinement_p1X = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_p1X); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p1X, - 1, 2, 4, 5, - (GtkAttachOptions)(GTK_FILL), + //- entries for p1 + GtkWidget* entry_lineRefinement_p1X = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_p1X); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p1X, + 1, 2, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_lineRefinement_p1Y = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_p1Y); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p1Y, - 2, 3, 4, 5, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_lineRefinement_p1Y = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_p1Y); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p1Y, + 2, 3, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_lineRefinement_p1Z = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_p1Z); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p1Z, - 3, 4, 4, 5, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_lineRefinement_p1Z = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_p1Z); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_p1Z, + 3, 4, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for adding lines - GtkWidget* button1 = gtk_button_new(); - gtk_widget_show(button1); - gtk_table_attach - ( - GTK_TABLE(table1), - button1, - 4, 5, 0, 5, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - g_signal_connect - ( - G_OBJECT(button1), - "clicked", - G_CALLBACK(addLineRefinement), - lineRefinementFramePtr_ - ); + //- set the button for adding lines + GtkWidget* button1 = gtk_button_new(); + gtk_widget_show(button1); + gtk_table_attach + ( + GTK_TABLE(table1), + button1, + 4, 5, 0, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + g_signal_connect + ( + G_OBJECT(button1), + "clicked", + G_CALLBACK(addLineRefinement), + lineRefinementFramePtr_ + ); - GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(button1), alignment1); - - GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox1); - gtk_container_add(GTK_CONTAINER(alignment1), hbox1); - - GtkWidget* image1 = - gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); - - GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); - gtk_widget_show(label3); - gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); - + GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(button1), alignment1); + + GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox1); + gtk_container_add(GTK_CONTAINER(alignment1), hbox1); + + GtkWidget* image1 = + gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); + + GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); + gtk_widget_show(label3); + gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- horizontal separator - GtkWidget* hseparator0 = gtk_hseparator_new(); - gtk_widget_show(hseparator0); - gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 5, 6, + //- horizontal separator + GtkWidget* hseparator0 = gtk_hseparator_new(); + gtk_widget_show(hseparator0); + gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 5, 6, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); + 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for existing line objects - GtkWidget* label_lineRefinement_existing = gtk_label_new("Existing lines"); - gtk_widget_show(label_lineRefinement_existing); - gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_existing, - 0, 1, 6, 7, - (GtkAttachOptions)(GTK_FILL), + //- label for existing line objects + GtkWidget* label_lineRefinement_existing = gtk_label_new("Existing lines"); + gtk_widget_show(label_lineRefinement_existing); + gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_existing, + 0, 1, 6, 7, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- combobox for existing box objects - GtkWidget* comboboxentry_lineRefinement_createdLines = - gtk_combo_new(); - gtk_widget_show(comboboxentry_lineRefinement_createdLines); - gtk_table_attach - ( - GTK_TABLE(table1),comboboxentry_lineRefinement_createdLines, - 1, 2, 6, 7, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions)(0), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO(comboboxentry_lineRefinement_createdLines)->entry - ), - 0 - ); - - + //- combobox for existing box objects + GtkWidget* comboboxentry_lineRefinement_createdLines = + gtk_combo_new(); + gtk_widget_show(comboboxentry_lineRefinement_createdLines); + gtk_table_attach + ( + GTK_TABLE(table1),comboboxentry_lineRefinement_createdLines, + 1, 2, 6, 7, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO(comboboxentry_lineRefinement_createdLines)->entry + ), + 0 + ); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for selected cell size - GtkWidget* label_lineRefinement_selectedCellSize = - gtk_label_new("Cell size [m]"); - gtk_widget_show(label_lineRefinement_selectedCellSize); - gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_selectedCellSize, - 0, 1, 7, 8, - (GtkAttachOptions)(GTK_FILL), + //- create a label for selected cell size + GtkWidget* label_lineRefinement_selectedCellSize = + gtk_label_new("Cell size [m]"); + gtk_widget_show(label_lineRefinement_selectedCellSize); + gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_selectedCellSize, + 0, 1, 7, 8, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_lineRefinement_selectedCellSize), 0, 0.5 - ); - + gtk_misc_set_alignment + ( + GTK_MISC(label_lineRefinement_selectedCellSize), 0, 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for selected cell size - GtkWidget* entry_lineRefinement_selectedCellSize = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_selectedCellSize); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedCellSize, - 1, 4, 7, 8, - (GtkAttachOptions)(GTK_FILL), + //- create a label for selected cell size + GtkWidget* entry_lineRefinement_selectedCellSize = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_selectedCellSize); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedCellSize, + 1, 4, 7, 8, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create labels for axes - label_axes = gtk_label_new("X"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 1, 2, 8, 9, - (GtkAttachOptions)(GTK_FILL), + //- create labels for axes + label_axes = gtk_label_new("X"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 1, 2, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Y"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 2, 3, 8, 9, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Y"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 2, 3, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Z"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 3, 4, 8, 9, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Z"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 3, 4, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for p0 - GtkWidget* label_lineRefinement_selectedP0 = - gtk_label_new("Starting point"); - gtk_widget_show(label_lineRefinement_selectedP0); - gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_selectedP0, - 0, 1, 9, 10, - (GtkAttachOptions)(GTK_FILL), + //- label for p0 + GtkWidget* label_lineRefinement_selectedP0 = + gtk_label_new("Starting point"); + gtk_widget_show(label_lineRefinement_selectedP0); + gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_selectedP0, + 0, 1, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_lineRefinement_selectedP0), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_lineRefinement_selectedP0), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for selected p0 - GtkWidget* entry_lineRefinement_selectedP0X = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_selectedP0X); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP0X, - 1, 2, 9, 10, - (GtkAttachOptions)(GTK_FILL), + //- entries for selected p0 + GtkWidget* entry_lineRefinement_selectedP0X = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_selectedP0X); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP0X, + 1, 2, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_lineRefinement_selectedP0Y = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_selectedP0Y); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP0Y, - 2, 3, 9, 10, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_lineRefinement_selectedP0Y = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_selectedP0Y); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP0Y, + 2, 3, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_lineRefinement_selectedP0Z = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_selectedP0Z); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP0Z, - 3, 4, 9, 10, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_lineRefinement_selectedP0Z = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_selectedP0Z); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP0Z, + 3, 4, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for selected p1 - GtkWidget* label_lineRefinement_selectedP1 = - gtk_label_new("End point"); - gtk_widget_show(label_lineRefinement_selectedP1); - gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_selectedP1, - 0, 1, 10, 11, - (GtkAttachOptions)(GTK_FILL), + //- label for selected p1 + GtkWidget* label_lineRefinement_selectedP1 = + gtk_label_new("End point"); + gtk_widget_show(label_lineRefinement_selectedP1); + gtk_table_attach(GTK_TABLE(table1), label_lineRefinement_selectedP1, + 0, 1, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_lineRefinement_selectedP1), 0, 0.5 - ); + gtk_misc_set_alignment + ( + GTK_MISC(label_lineRefinement_selectedP1), 0, 0.5 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for p1 - GtkWidget* entry_lineRefinement_selectedP1X = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_selectedP1X); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP1X, - 1, 2, 10, 11, - (GtkAttachOptions)(GTK_FILL), + //- entries for p1 + GtkWidget* entry_lineRefinement_selectedP1X = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_selectedP1X); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP1X, + 1, 2, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_lineRefinement_selectedP1Y = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_selectedP1Y); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP1Y, - 2, 3, 10, 11, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_lineRefinement_selectedP1Y = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_selectedP1Y); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP1Y, + 2, 3, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_lineRefinement_selectedP1Z = gtk_entry_new(); - gtk_widget_show(entry_lineRefinement_selectedP1Z); - gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP1Z, - 3, 4, 10, 11, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_lineRefinement_selectedP1Z = gtk_entry_new(); + gtk_widget_show(entry_lineRefinement_selectedP1Z); + gtk_table_attach(GTK_TABLE(table1), entry_lineRefinement_selectedP1Z, + 3, 4, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for removing patches - GtkWidget* button2 = gtk_button_new(); - gtk_widget_show(button2); - gtk_table_attach - ( - GTK_TABLE(table1), - button2, - 4, 5, 6, 11, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - g_signal_connect - ( - G_OBJECT(button2), - "clicked", - G_CALLBACK(removeLineRefinement), - lineRefinementFramePtr_ - ); - - GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment2); - gtk_container_add(GTK_CONTAINER(button2), alignment2); - - GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox2); - gtk_container_add(GTK_CONTAINER(alignment2), hbox2); - - GtkWidget* image2 = - gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image2); - gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); - - GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); - + //- set the button for removing patches + GtkWidget* button2 = gtk_button_new(); + gtk_widget_show(button2); + gtk_table_attach + ( + GTK_TABLE(table1), + button2, + 4, 5, 6, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + g_signal_connect + ( + G_OBJECT(button2), + "clicked", + G_CALLBACK(removeLineRefinement), + lineRefinementFramePtr_ + ); + + GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment2); + gtk_container_add(GTK_CONTAINER(button2), alignment2); + + GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox2); + gtk_container_add(GTK_CONTAINER(alignment2), hbox2); + + GtkWidget* image2 = + gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image2); + gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); + + GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); + gtk_widget_show(label5); + gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - lineRefinementFramePtr_, - lineRefinementFramePtr_, - "lineRefinementFramePtr_"); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - table1, - "table1" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineName, - "entry_lineName" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_cellSize, - "entry_lineRefinement_cellSize" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_p0X, - "entry_lineRefinement_p0X" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_p0Y, - "entry_lineRefinement_p0Y" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_p0Z, - "entry_lineRefinement_p0Z" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_p1X, - "entry_lineRefinement_p1X" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_p1Y, - "entry_lineRefinement_p1Y" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_p1Z, - "entry_lineRefinement_p1Z" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - comboboxentry_lineRefinement_createdLines, - "comboboxentry_lineRefinement_createdLines" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_selectedCellSize, - "entry_lineRefinement_selectedCellSize" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_selectedP0X, - "entry_lineRefinement_selectedP0X" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_selectedP0Y, - "entry_lineRefinement_selectedP0Y" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_selectedP0Z, - "entry_lineRefinement_selectedP0Z" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_selectedP1X, - "entry_lineRefinement_selectedP1X" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_selectedP1Y, - "entry_lineRefinement_selectedP1Y" - ); - GLADE_HOOKUP_OBJECT - ( - lineRefinementFramePtr_, - entry_lineRefinement_selectedP1Z, - "entry_lineRefinement_selectedP1Z" - ); - - updateLineRefinements(lineRefinementFramePtr_); - - g_signal_connect - ( - G_OBJECT - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_lineRefinement_createdLines)->entry - ) - ), - "changed", - G_CALLBACK(showDataForLineRefinement), - lineRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_lineRefinement_selectedCellSize), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - lineRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_lineRefinement_selectedP0X), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - lineRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_lineRefinement_selectedP0Y), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - lineRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_lineRefinement_selectedP0Z), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - lineRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_lineRefinement_selectedP1X), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - lineRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_lineRefinement_selectedP1Y), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - lineRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_lineRefinement_selectedP1Z), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - lineRefinementFramePtr_ - ); - - gtk_widget_show(lineRefinementFramePtr_); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + lineRefinementFramePtr_, + lineRefinementFramePtr_, + "lineRefinementFramePtr_"); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + table1, + "table1" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineName, + "entry_lineName" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_cellSize, + "entry_lineRefinement_cellSize" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_p0X, + "entry_lineRefinement_p0X" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_p0Y, + "entry_lineRefinement_p0Y" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_p0Z, + "entry_lineRefinement_p0Z" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_p1X, + "entry_lineRefinement_p1X" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_p1Y, + "entry_lineRefinement_p1Y" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_p1Z, + "entry_lineRefinement_p1Z" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + comboboxentry_lineRefinement_createdLines, + "comboboxentry_lineRefinement_createdLines" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_selectedCellSize, + "entry_lineRefinement_selectedCellSize" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_selectedP0X, + "entry_lineRefinement_selectedP0X" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_selectedP0Y, + "entry_lineRefinement_selectedP0Y" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_selectedP0Z, + "entry_lineRefinement_selectedP0Z" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_selectedP1X, + "entry_lineRefinement_selectedP1X" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_selectedP1Y, + "entry_lineRefinement_selectedP1Y" + ); + GLADE_HOOKUP_OBJECT + ( + lineRefinementFramePtr_, + entry_lineRefinement_selectedP1Z, + "entry_lineRefinement_selectedP1Z" + ); + + updateLineRefinements(lineRefinementFramePtr_); + + g_signal_connect + ( + G_OBJECT + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_lineRefinement_createdLines)->entry + ) + ), + "changed", + G_CALLBACK(showDataForLineRefinement), + lineRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_lineRefinement_selectedCellSize), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + lineRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_lineRefinement_selectedP0X), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + lineRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_lineRefinement_selectedP0Y), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + lineRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_lineRefinement_selectedP0Z), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + lineRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_lineRefinement_selectedP1X), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + lineRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_lineRefinement_selectedP1Y), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + lineRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_lineRefinement_selectedP1Z), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + lineRefinementFramePtr_ + ); + + gtk_widget_show(lineRefinementFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKLocalRefinement.C b/GUI/meshGenGTK/meshGenGTKLocalRefinement.C index 2d83506..b9cf1f5 100644 --- a/GUI/meshGenGTK/meshGenGTKLocalRefinement.C +++ b/GUI/meshGenGTK/meshGenGTKLocalRefinement.C @@ -36,272 +36,272 @@ Description namespace Foam { - + extern "C" { - + static void updateSizeForSelectedPatch ( - GtkWidget* widget, - GtkWidget* entry_localRefinement_selectedCellSize + GtkWidget* widget, + GtkWidget* entry_localRefinement_selectedCellSize ) { - //- display the size for a patch selected in combo box - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - widget - ) - ); - - if( name == "" ) - { - gtk_entry_set_text - ( - GTK_ENTRY(entry_localRefinement_selectedCellSize), - "" - ); - } + //- display the size for a patch selected in combo box + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + widget + ) + ); + + if( name == "" ) + { + gtk_entry_set_text + ( + GTK_ENTRY(entry_localRefinement_selectedCellSize), + "" + ); + } - patchRefinementList refPatches = guiPtr->patchCellSize(); - forAll(refPatches, patchI) - if( refPatches[patchI].patchName() == name ) - { - const word s = help::scalarToText(refPatches[patchI].cellSize()); - gtk_entry_set_text - ( - GTK_ENTRY(entry_localRefinement_selectedCellSize), - s.c_str() - ); - } + patchRefinementList refPatches = guiPtr->patchCellSize(); + forAll(refPatches, patchI) + if( refPatches[patchI].patchName() == name ) + { + const word s = help::scalarToText(refPatches[patchI].cellSize()); + gtk_entry_set_text + ( + GTK_ENTRY(entry_localRefinement_selectedCellSize), + s.c_str() + ); + } } static void resetSizeForSelectedPatch ( - GtkWidget* widget, - GtkWidget* comboboxentry_localRefinement_selectedPatches + GtkWidget* widget, + GtkWidget* comboboxentry_localRefinement_selectedPatches ) { - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_localRefinement_selectedPatches - )->entry - ) - ); - - if( name == "" ) - return; - - guiPtr->removePatchCellSize(name); - - const word text = - gtk_entry_get_text - ( - GTK_ENTRY - ( - widget - ) - ); - const scalar size = help::textToScalar(text); + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_localRefinement_selectedPatches + )->entry + ) + ); + + if( name == "" ) + return; + + guiPtr->removePatchCellSize(name); + + const word text = + gtk_entry_get_text + ( + GTK_ENTRY + ( + widget + ) + ); + const scalar size = help::textToScalar(text); - patchRefinement pr(name, Foam::min(size, guiPtr->maxCellSize())); + patchRefinement pr(name, Foam::min(size, guiPtr->maxCellSize())); - guiPtr->addPatchCellSize(pr); + guiPtr->addPatchCellSize(pr); } - + static void updateLocalRefinementPatches(GtkWidget* localRefinementFramePtr) { - GtkWidget* comboboxentry_localRefinement_availablePatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(localRefinementFramePtr), - "comboboxentry_localRefinement_availablePatches" - ); - GtkWidget* comboboxentry_localRefinement_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(localRefinementFramePtr), - "comboboxentry_localRefinement_selectedPatches" - ); - //- update available patches - patchRefinementList alreadyUsed = guiPtr->patchCellSize(); + GtkWidget* comboboxentry_localRefinement_availablePatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(localRefinementFramePtr), + "comboboxentry_localRefinement_availablePatches" + ); + GtkWidget* comboboxentry_localRefinement_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(localRefinementFramePtr), + "comboboxentry_localRefinement_selectedPatches" + ); + //- update available patches + patchRefinementList alreadyUsed = guiPtr->patchCellSize(); - wordHashSet usedNames; - forAll(alreadyUsed, nameI) - usedNames.insert(alreadyUsed[nameI].patchName()); + wordHashSet usedNames; + forAll(alreadyUsed, nameI) + usedNames.insert(alreadyUsed[nameI].patchName()); - GList* avPatches = 0; - label nAvailable(0); - const triSurface& surf = guiPtr->surface(); - forAll(surf.patches(), patchI) - { - if( usedNames.found(surf.patches()[patchI].name()) ) - continue; - const char* name = surf.patches()[patchI].name().c_str(); - avPatches = g_list_append(avPatches, const_cast(name)); - ++nAvailable; - } + GList* avPatches = 0; + label nAvailable(0); + const triSurface& surf = guiPtr->surface(); + forAll(surf.patches(), patchI) + { + if( usedNames.found(surf.patches()[patchI].name()) ) + continue; + const char* name = surf.patches()[patchI].name().c_str(); + avPatches = g_list_append(avPatches, const_cast(name)); + ++nAvailable; + } - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_localRefinement_availablePatches - ), avPatches - ); - - if( nAvailable == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_localRefinement_availablePatches - )->entry - ), "" - ); - } - - //- update used patches - GList* selPatches = 0; - forAll(alreadyUsed, patchI) - { - const char* name = alreadyUsed[patchI].patchName().c_str(); - selPatches = g_list_append(selPatches, const_cast(name)); - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_localRefinement_selectedPatches - ), selPatches - ); - - if( alreadyUsed.size() == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_localRefinement_selectedPatches - )->entry - ), "" - ); - } + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_localRefinement_availablePatches + ), avPatches + ); + + if( nAvailable == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_localRefinement_availablePatches + )->entry + ), "" + ); + } + + //- update used patches + GList* selPatches = 0; + forAll(alreadyUsed, patchI) + { + const char* name = alreadyUsed[patchI].patchName().c_str(); + selPatches = g_list_append(selPatches, const_cast(name)); + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_localRefinement_selectedPatches + ), selPatches + ); + + if( alreadyUsed.size() == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_localRefinement_selectedPatches + )->entry + ), "" + ); + } - g_list_free(avPatches); - g_list_free(selPatches); - - GtkWidget* entry_localRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(localRefinementFramePtr), - "entry_localRefinement_selectedCellSize" - ); - - updateSizeForSelectedPatch - ( - GTK_COMBO - ( - comboboxentry_localRefinement_selectedPatches - )->entry, - entry_localRefinement_selectedCellSize - ); + g_list_free(avPatches); + g_list_free(selPatches); + + GtkWidget* entry_localRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(localRefinementFramePtr), + "entry_localRefinement_selectedCellSize" + ); + + updateSizeForSelectedPatch + ( + GTK_COMBO + ( + comboboxentry_localRefinement_selectedPatches + )->entry, + entry_localRefinement_selectedCellSize + ); } - + static void addPatchCellSize ( - GtkWidget* widget, - GtkWidget* localRefinementFramePtr + GtkWidget* widget, + GtkWidget* localRefinementFramePtr ) { - GtkWidget* comboboxentry_localRefinement_availablePatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(localRefinementFramePtr), - "comboboxentry_localRefinement_availablePatches" - ); - GtkWidget* entry_localRefinement_cellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(localRefinementFramePtr), - "entry_localRefinement_cellSize" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_localRefinement_availablePatches - )->entry - ) - ); - - if( name == "" ) - return; - - const word text = - gtk_entry_get_text - ( - GTK_ENTRY - ( - entry_localRefinement_cellSize - ) - ); - const scalar size = help::textToScalar(text); + GtkWidget* comboboxentry_localRefinement_availablePatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(localRefinementFramePtr), + "comboboxentry_localRefinement_availablePatches" + ); + GtkWidget* entry_localRefinement_cellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(localRefinementFramePtr), + "entry_localRefinement_cellSize" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_localRefinement_availablePatches + )->entry + ) + ); + + if( name == "" ) + return; + + const word text = + gtk_entry_get_text + ( + GTK_ENTRY + ( + entry_localRefinement_cellSize + ) + ); + const scalar size = help::textToScalar(text); - patchRefinement pr(name, Foam::min(size, guiPtr->maxCellSize())); + patchRefinement pr(name, Foam::min(size, guiPtr->maxCellSize())); - guiPtr->addPatchCellSize(pr); + guiPtr->addPatchCellSize(pr); - updateLocalRefinementPatches(localRefinementFramePtr); + updateLocalRefinementPatches(localRefinementFramePtr); } static void removePatchRefinement ( - GtkWidget* widget, - GtkWidget* localRefinementFramePtr + GtkWidget* widget, + GtkWidget* localRefinementFramePtr ) { - GtkWidget* comboboxentry_localRefinement_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(localRefinementFramePtr), - "comboboxentry_localRefinement_selectedPatches" - ); - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_localRefinement_selectedPatches - )->entry - ) - ); - - if( name == "" ) - return; - - guiPtr->removePatchCellSize(name); - - updateLocalRefinementPatches(localRefinementFramePtr); + GtkWidget* comboboxentry_localRefinement_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(localRefinementFramePtr), + "comboboxentry_localRefinement_selectedPatches" + ); + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_localRefinement_selectedPatches + )->entry + ) + ); + + if( name == "" ) + return; + + guiPtr->removePatchCellSize(name); + + updateLocalRefinementPatches(localRefinementFramePtr); } } @@ -310,278 +310,278 @@ static void removePatchRefinement void meshGenGTK::createLocalRefinementWindowPage() { - guiPtr = &meshGui_; - - localRefinementFramePtr_ = gtk_frame_new(NULL); + guiPtr = &meshGui_; + + localRefinementFramePtr_ = gtk_frame_new(NULL); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a table - GtkWidget* table1 = gtk_table_new(2, 4, FALSE); - gtk_widget_show(table1); - gtk_container_add - ( - GTK_CONTAINER(localRefinementFramePtr_), - table1 - ); + //- create a table + GtkWidget* table1 = gtk_table_new(2, 4, FALSE); + gtk_widget_show(table1); + gtk_container_add + ( + GTK_CONTAINER(localRefinementFramePtr_), + table1 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set label for available patches - GtkWidget* label_localRefinement_availablePatches = - gtk_label_new("Available patches"); - gtk_widget_show(label_localRefinement_availablePatches); - gtk_table_attach - ( - GTK_TABLE(table1), - label_localRefinement_availablePatches, - 0, 1, 0, 1, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0 - ); - gtk_misc_set_alignment - ( - GTK_MISC(label_localRefinement_availablePatches), - 0, - 0.5 - ); - + //- set label for available patches + GtkWidget* label_localRefinement_availablePatches = + gtk_label_new("Available patches"); + gtk_widget_show(label_localRefinement_availablePatches); + gtk_table_attach + ( + GTK_TABLE(table1), + label_localRefinement_availablePatches, + 0, 1, 0, 1, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions) (0), 0, 0 + ); + gtk_misc_set_alignment + ( + GTK_MISC(label_localRefinement_availablePatches), + 0, + 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create the combo box for available patches - GtkWidget* comboboxentry_localRefinement_availablePatches = - gtk_combo_new(); - gtk_widget_show - ( - comboboxentry_localRefinement_availablePatches - ); - gtk_table_attach - ( - GTK_TABLE(table1), - comboboxentry_localRefinement_availablePatches, - 1, 2, 0, 1, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), - (GtkAttachOptions)(GTK_FILL), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO - ( - comboboxentry_localRefinement_availablePatches - )->entry - ), - 0 - ); - + //- create the combo box for available patches + GtkWidget* comboboxentry_localRefinement_availablePatches = + gtk_combo_new(); + gtk_widget_show + ( + comboboxentry_localRefinement_availablePatches + ); + gtk_table_attach + ( + GTK_TABLE(table1), + comboboxentry_localRefinement_availablePatches, + 1, 2, 0, 1, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(GTK_FILL), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO + ( + comboboxentry_localRefinement_availablePatches + )->entry + ), + 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entry for cell size - GtkWidget* entry_localRefinement_cellSize = gtk_entry_new(); - gtk_widget_show(entry_localRefinement_cellSize); - - gtk_table_attach - ( - GTK_TABLE(table1), - entry_localRefinement_cellSize, - 2, 3, 0, 1, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), - (GtkAttachOptions)(GTK_FILL), 0, 0 - ); - + //- entry for cell size + GtkWidget* entry_localRefinement_cellSize = gtk_entry_new(); + gtk_widget_show(entry_localRefinement_cellSize); + + gtk_table_attach + ( + GTK_TABLE(table1), + entry_localRefinement_cellSize, + 2, 3, 0, 1, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(GTK_FILL), 0, 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for adding patches - GtkWidget* button1 = gtk_button_new(); - gtk_widget_show(button1); - gtk_table_attach - ( - GTK_TABLE(table1), - button1, - 3, 4, 0, 1, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - - g_signal_connect - ( - G_OBJECT(button1), - "clicked", - G_CALLBACK(addPatchCellSize), - localRefinementFramePtr_ - ); + //- set the button for adding patches + GtkWidget* button1 = gtk_button_new(); + gtk_widget_show(button1); + gtk_table_attach + ( + GTK_TABLE(table1), + button1, + 3, 4, 0, 1, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + + g_signal_connect + ( + G_OBJECT(button1), + "clicked", + G_CALLBACK(addPatchCellSize), + localRefinementFramePtr_ + ); - GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(button1), alignment1); - - GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox1); - gtk_container_add(GTK_CONTAINER(alignment1), hbox1); - - GtkWidget* image1 = - gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); - - GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); - gtk_widget_show(label3); - gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); + GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(button1), alignment1); + + GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox1); + gtk_container_add(GTK_CONTAINER(alignment1), hbox1); + + GtkWidget* image1 = + gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); + + GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); + gtk_widget_show(label3); + gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set label for selected patches - GtkWidget* label_localRefinement_selectedPatches = - gtk_label_new("Selected patches"); - gtk_widget_show(label_localRefinement_selectedPatches); - gtk_table_attach - ( - GTK_TABLE(table1), - label_localRefinement_selectedPatches, - 0, 1, 1, 2, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - gtk_misc_set_alignment - ( - GTK_MISC(label_localRefinement_selectedPatches), - 0, - 0.5 - ); - + //- set label for selected patches + GtkWidget* label_localRefinement_selectedPatches = + gtk_label_new("Selected patches"); + gtk_widget_show(label_localRefinement_selectedPatches); + gtk_table_attach + ( + GTK_TABLE(table1), + label_localRefinement_selectedPatches, + 0, 1, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + gtk_misc_set_alignment + ( + GTK_MISC(label_localRefinement_selectedPatches), + 0, + 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entry for selected cell size - GtkWidget* entry_localRefinement_selectedCellSize = gtk_entry_new(); - gtk_widget_show(entry_localRefinement_selectedCellSize); - - gtk_table_attach - ( - GTK_TABLE(table1), - entry_localRefinement_selectedCellSize, - 2, 3, 1, 2, - (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), - (GtkAttachOptions)(GTK_FILL), 0, 0 - ); - + //- entry for selected cell size + GtkWidget* entry_localRefinement_selectedCellSize = gtk_entry_new(); + gtk_widget_show(entry_localRefinement_selectedCellSize); + + gtk_table_attach + ( + GTK_TABLE(table1), + entry_localRefinement_selectedCellSize, + 2, 3, 1, 2, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(GTK_FILL), 0, 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create the combo box for selected patches - GtkWidget* comboboxentry_localRefinement_selectedPatches = gtk_combo_new(); - gtk_widget_show(comboboxentry_localRefinement_selectedPatches); + //- create the combo box for selected patches + GtkWidget* comboboxentry_localRefinement_selectedPatches = gtk_combo_new(); + gtk_widget_show(comboboxentry_localRefinement_selectedPatches); - gtk_table_attach - ( - GTK_TABLE(table1), - comboboxentry_localRefinement_selectedPatches, - 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO - ( - comboboxentry_localRefinement_selectedPatches - )->entry - ), - 0 - ); - - //- change the displayed value to match the selected patch - g_signal_connect - ( - G_OBJECT - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_localRefinement_selectedPatches - )->entry - ) - ), - "changed", - G_CALLBACK(updateSizeForSelectedPatch), - entry_localRefinement_selectedCellSize - ); - - //- change the selected size in case the user decides it - g_signal_connect - ( - G_OBJECT(entry_localRefinement_selectedCellSize), - "changed", - G_CALLBACK(resetSizeForSelectedPatch), - comboboxentry_localRefinement_selectedPatches - ); - + gtk_table_attach + ( + GTK_TABLE(table1), + comboboxentry_localRefinement_selectedPatches, + 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO + ( + comboboxentry_localRefinement_selectedPatches + )->entry + ), + 0 + ); + + //- change the displayed value to match the selected patch + g_signal_connect + ( + G_OBJECT + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_localRefinement_selectedPatches + )->entry + ) + ), + "changed", + G_CALLBACK(updateSizeForSelectedPatch), + entry_localRefinement_selectedCellSize + ); + + //- change the selected size in case the user decides it + g_signal_connect + ( + G_OBJECT(entry_localRefinement_selectedCellSize), + "changed", + G_CALLBACK(resetSizeForSelectedPatch), + comboboxentry_localRefinement_selectedPatches + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for removing patches - GtkWidget* button2 = gtk_button_new(); - gtk_widget_show(button2); - gtk_table_attach - ( - GTK_TABLE(table1), - button2, - 3, 4, 1, 2, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 - ); - - g_signal_connect - ( - G_OBJECT(button2), - "clicked", - G_CALLBACK(removePatchRefinement), - localRefinementFramePtr_ - ); - - GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment2); - gtk_container_add(GTK_CONTAINER(button2), alignment2); - - GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox2); - gtk_container_add(GTK_CONTAINER(alignment2), hbox2); - - GtkWidget* image2 = - gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image2); - gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); - - GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); - + //- set the button for removing patches + GtkWidget* button2 = gtk_button_new(); + gtk_widget_show(button2); + gtk_table_attach + ( + GTK_TABLE(table1), + button2, + 3, 4, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0 + ); + + g_signal_connect + ( + G_OBJECT(button2), + "clicked", + G_CALLBACK(removePatchRefinement), + localRefinementFramePtr_ + ); + + GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment2); + gtk_container_add(GTK_CONTAINER(button2), alignment2); + + GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox2); + gtk_container_add(GTK_CONTAINER(alignment2), hbox2); + + GtkWidget* image2 = + gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image2); + gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); + + GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); + gtk_widget_show(label5); + gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - localRefinementFramePtr_, - localRefinementFramePtr_, - "Local refinement frame" - ); - GLADE_HOOKUP_OBJECT - ( - localRefinementFramePtr_, - comboboxentry_localRefinement_availablePatches, - "comboboxentry_localRefinement_availablePatches" - ); - GLADE_HOOKUP_OBJECT - ( - localRefinementFramePtr_, - entry_localRefinement_cellSize, - "entry_localRefinement_cellSize" - ); - GLADE_HOOKUP_OBJECT - ( - localRefinementFramePtr_, - comboboxentry_localRefinement_selectedPatches, - "comboboxentry_localRefinement_selectedPatches" - ); - GLADE_HOOKUP_OBJECT - ( - localRefinementFramePtr_, - entry_localRefinement_selectedCellSize, - "entry_localRefinement_selectedCellSize" - ); - - updateLocalRefinementPatches(localRefinementFramePtr_); - - gtk_widget_show(localRefinementFramePtr_); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + localRefinementFramePtr_, + localRefinementFramePtr_, + "Local refinement frame" + ); + GLADE_HOOKUP_OBJECT + ( + localRefinementFramePtr_, + comboboxentry_localRefinement_availablePatches, + "comboboxentry_localRefinement_availablePatches" + ); + GLADE_HOOKUP_OBJECT + ( + localRefinementFramePtr_, + entry_localRefinement_cellSize, + "entry_localRefinement_cellSize" + ); + GLADE_HOOKUP_OBJECT + ( + localRefinementFramePtr_, + comboboxentry_localRefinement_selectedPatches, + "comboboxentry_localRefinement_selectedPatches" + ); + GLADE_HOOKUP_OBJECT + ( + localRefinementFramePtr_, + entry_localRefinement_selectedCellSize, + "entry_localRefinement_selectedCellSize" + ); + + updateLocalRefinementPatches(localRefinementFramePtr_); + + gtk_widget_show(localRefinementFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKLocalSettingsMainWindow.C b/GUI/meshGenGTK/meshGenGTKLocalSettingsMainWindow.C index 139d4bc..4684935 100644 --- a/GUI/meshGenGTK/meshGenGTKLocalSettingsMainWindow.C +++ b/GUI/meshGenGTK/meshGenGTKLocalSettingsMainWindow.C @@ -37,88 +37,88 @@ namespace Foam void meshGenGTK::createLocalSettingsMainWindowPage() { - //- create pages within this page - createLocalRefinementWindowPage(); - createKeepCellsIntersectingPatchesWindowPage(); - createBndLayersWindowPage(); - - localSettingsMainFramePtr_ = gtk_frame_new(NULL); - - GtkWidget* notebook1 = gtk_notebook_new (); - - gtk_container_add(GTK_CONTAINER(localSettingsMainFramePtr_), notebook1); - - //- add page for local refinement - GtkWidget* label_localRefinement = gtk_label_new("Local refinement"); - gtk_widget_show(label_localRefinement); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - localRefinementFramePtr_, - label_localRefinement - ); - - //- add page for keepCellsIntersectingPatches - GtkWidget* label_keepBoxesIntersectingPatches = - gtk_label_new("Keep octree boxes intersecting patches"); - gtk_widget_show(label_keepBoxesIntersectingPatches); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - keepCellsIntersectingPatchesFramePtr_, - label_keepBoxesIntersectingPatches - ); - - //- add page for bnd layers - GtkWidget* label_bndLayers = - gtk_label_new("Boundary layer for patches"); - gtk_widget_show(label_bndLayers); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - bndLayersFramePtr_, - label_bndLayers - ); - - //- show the notebook - gtk_widget_show(notebook1); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - localSettingsMainFramePtr_, - localSettingsMainFramePtr_, - "localSettingsMainFramePtr_" - ); - GLADE_HOOKUP_OBJECT - ( - localSettingsMainFramePtr_, - notebook1, - "notebook1" - ); - GLADE_HOOKUP_OBJECT - ( - localSettingsMainFramePtr_, - label_localRefinement, - "label_localRefinement" - ); - GLADE_HOOKUP_OBJECT - ( - localSettingsMainFramePtr_, - label_keepBoxesIntersectingPatches, - "label_keepBoxesIntersectingPatches" - ); - GLADE_HOOKUP_OBJECT - ( - localSettingsMainFramePtr_, - label_bndLayers, - "label_bndLayers" - ); - - gtk_widget_show(localSettingsMainFramePtr_); + //- create pages within this page + createLocalRefinementWindowPage(); + createKeepCellsIntersectingPatchesWindowPage(); + createBndLayersWindowPage(); + + localSettingsMainFramePtr_ = gtk_frame_new(NULL); + + GtkWidget* notebook1 = gtk_notebook_new (); + + gtk_container_add(GTK_CONTAINER(localSettingsMainFramePtr_), notebook1); + + //- add page for local refinement + GtkWidget* label_localRefinement = gtk_label_new("Local refinement"); + gtk_widget_show(label_localRefinement); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + localRefinementFramePtr_, + label_localRefinement + ); + + //- add page for keepCellsIntersectingPatches + GtkWidget* label_keepBoxesIntersectingPatches = + gtk_label_new("Keep octree boxes intersecting patches"); + gtk_widget_show(label_keepBoxesIntersectingPatches); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + keepCellsIntersectingPatchesFramePtr_, + label_keepBoxesIntersectingPatches + ); + + //- add page for bnd layers + GtkWidget* label_bndLayers = + gtk_label_new("Boundary layer for patches"); + gtk_widget_show(label_bndLayers); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + bndLayersFramePtr_, + label_bndLayers + ); + + //- show the notebook + gtk_widget_show(notebook1); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + localSettingsMainFramePtr_, + localSettingsMainFramePtr_, + "localSettingsMainFramePtr_" + ); + GLADE_HOOKUP_OBJECT + ( + localSettingsMainFramePtr_, + notebook1, + "notebook1" + ); + GLADE_HOOKUP_OBJECT + ( + localSettingsMainFramePtr_, + label_localRefinement, + "label_localRefinement" + ); + GLADE_HOOKUP_OBJECT + ( + localSettingsMainFramePtr_, + label_keepBoxesIntersectingPatches, + "label_keepBoxesIntersectingPatches" + ); + GLADE_HOOKUP_OBJECT + ( + localSettingsMainFramePtr_, + label_bndLayers, + "label_bndLayers" + ); + + gtk_widget_show(localSettingsMainFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKMainWindow.C b/GUI/meshGenGTK/meshGenGTKMainWindow.C index e1b6aec..057dbcb 100644 --- a/GUI/meshGenGTK/meshGenGTKMainWindow.C +++ b/GUI/meshGenGTK/meshGenGTKMainWindow.C @@ -34,150 +34,150 @@ namespace Foam { // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - + // Callback functions go here void saveMeshDictCallback(void* data) { - guiPtr->writeDict(); + guiPtr->writeDict(); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // void meshGenGTK::createMainWindowPage() { - guiPtr = &meshGui_; - - //- create the main window - GtkWidget* mainWindowPtr_ = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW (mainWindowPtr_), "Mesh generation GUI"); - g_signal_connect - ( - G_OBJECT(mainWindowPtr_), - "destroy", - G_CALLBACK(gtk_main_quit), - NULL - ); - - GtkWidget* vbox1 = gtk_vbox_new(FALSE, 0); - gtk_widget_show(vbox1); - gtk_container_add(GTK_CONTAINER (mainWindowPtr_), vbox1); - - //- create a toolbar (for reading and saving meshDict) - GtkWidget* toolbar1 = gtk_toolbar_new(); - gtk_widget_show(toolbar1); - gtk_box_pack_start(GTK_BOX(vbox1), toolbar1, FALSE, FALSE, 0); - gtk_toolbar_set_style(GTK_TOOLBAR(toolbar1), GTK_TOOLBAR_ICONS); - //GtkIconSize tmp_toolbar_icon_size = - //gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar1)); - - GtkWidget* toolitem1 = (GtkWidget*)gtk_tool_item_new(); - gtk_widget_show(toolitem1); - gtk_container_add(GTK_CONTAINER(toolbar1), toolitem1); - - GtkWidget* button_mainWindow_save = - gtk_button_new_with_mnemonic("Save meshDict"); - gtk_widget_show(button_mainWindow_save); - gtk_container_add(GTK_CONTAINER(toolitem1), button_mainWindow_save); - - g_signal_connect - ( - G_OBJECT(button_mainWindow_save), - "clicked", - G_CALLBACK(saveMeshDictCallback), - static_cast(&meshGui_) - ); - - //- create exit button - GtkWidget* toolitem2 = (GtkWidget*)gtk_tool_item_new(); - gtk_widget_show(toolitem2); - gtk_container_add(GTK_CONTAINER(toolbar1), toolitem2); - - GtkWidget* button_mainWindow_exit = gtk_button_new_with_mnemonic("Exit"); - gtk_widget_show(button_mainWindow_exit); - gtk_container_add(GTK_CONTAINER(toolitem2), button_mainWindow_exit); - - g_signal_connect - ( - G_OBJECT(button_mainWindow_exit), - "clicked", - G_CALLBACK(gtk_main_quit), - NULL - ); - - //- create a notebook which allows the user to switch between - //- the local and global settings - GtkWidget* notebook1 = gtk_notebook_new(); - - gtk_box_pack_start(GTK_BOX(vbox1), notebook1, TRUE, TRUE, 0); - - //- append the page for general settings - GtkWidget* label_generalSettings = gtk_label_new("General settings"); - gtk_widget_show(label_generalSettings); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - generalPageFramePtr_, - label_generalSettings - ); - - //- add local settings - GtkWidget* label_localSettings = gtk_label_new("Local settings"); - gtk_widget_show(label_localSettings); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - localSettingsMainFramePtr_, - label_localSettings - ); - - //- add object refinements - GtkWidget* label_objectRefinements = gtk_label_new("Object refinements"); - gtk_widget_show(label_objectRefinements); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - objectRefinementMainFramePtr_, - label_objectRefinements - ); - - //- add patch renaming - GtkWidget* label_renameBoundary = gtk_label_new("Rename boundary patches"); - gtk_widget_show(label_renameBoundary); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - renameBoundaryFramePtr_, - label_renameBoundary - ); - - gtk_widget_show(notebook1); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - mainWindowPtr_, - mainWindowPtr_, - "Mesh generation GUI" - ); - - GLADE_HOOKUP_OBJECT - ( - mainWindowPtr_, - button_mainWindow_save, - "button_mainWindow_save" - ); - GLADE_HOOKUP_OBJECT - ( - mainWindowPtr_, - button_mainWindow_exit, - "button_mainWindow_exit" - ); - - gtk_widget_show(mainWindowPtr_); + guiPtr = &meshGui_; + + //- create the main window + GtkWidget* mainWindowPtr_ = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW (mainWindowPtr_), "Mesh generation GUI"); + g_signal_connect + ( + G_OBJECT(mainWindowPtr_), + "destroy", + G_CALLBACK(gtk_main_quit), + NULL + ); + + GtkWidget* vbox1 = gtk_vbox_new(FALSE, 0); + gtk_widget_show(vbox1); + gtk_container_add(GTK_CONTAINER (mainWindowPtr_), vbox1); + + //- create a toolbar (for reading and saving meshDict) + GtkWidget* toolbar1 = gtk_toolbar_new(); + gtk_widget_show(toolbar1); + gtk_box_pack_start(GTK_BOX(vbox1), toolbar1, FALSE, FALSE, 0); + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar1), GTK_TOOLBAR_ICONS); + //GtkIconSize tmp_toolbar_icon_size = + //gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar1)); + + GtkWidget* toolitem1 = (GtkWidget*)gtk_tool_item_new(); + gtk_widget_show(toolitem1); + gtk_container_add(GTK_CONTAINER(toolbar1), toolitem1); + + GtkWidget* button_mainWindow_save = + gtk_button_new_with_mnemonic("Save meshDict"); + gtk_widget_show(button_mainWindow_save); + gtk_container_add(GTK_CONTAINER(toolitem1), button_mainWindow_save); + + g_signal_connect + ( + G_OBJECT(button_mainWindow_save), + "clicked", + G_CALLBACK(saveMeshDictCallback), + static_cast(&meshGui_) + ); + + //- create exit button + GtkWidget* toolitem2 = (GtkWidget*)gtk_tool_item_new(); + gtk_widget_show(toolitem2); + gtk_container_add(GTK_CONTAINER(toolbar1), toolitem2); + + GtkWidget* button_mainWindow_exit = gtk_button_new_with_mnemonic("Exit"); + gtk_widget_show(button_mainWindow_exit); + gtk_container_add(GTK_CONTAINER(toolitem2), button_mainWindow_exit); + + g_signal_connect + ( + G_OBJECT(button_mainWindow_exit), + "clicked", + G_CALLBACK(gtk_main_quit), + NULL + ); + + //- create a notebook which allows the user to switch between + //- the local and global settings + GtkWidget* notebook1 = gtk_notebook_new(); + + gtk_box_pack_start(GTK_BOX(vbox1), notebook1, TRUE, TRUE, 0); + + //- append the page for general settings + GtkWidget* label_generalSettings = gtk_label_new("General settings"); + gtk_widget_show(label_generalSettings); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + generalPageFramePtr_, + label_generalSettings + ); + + //- add local settings + GtkWidget* label_localSettings = gtk_label_new("Local settings"); + gtk_widget_show(label_localSettings); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + localSettingsMainFramePtr_, + label_localSettings + ); + + //- add object refinements + GtkWidget* label_objectRefinements = gtk_label_new("Object refinements"); + gtk_widget_show(label_objectRefinements); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + objectRefinementMainFramePtr_, + label_objectRefinements + ); + + //- add patch renaming + GtkWidget* label_renameBoundary = gtk_label_new("Rename boundary patches"); + gtk_widget_show(label_renameBoundary); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + renameBoundaryFramePtr_, + label_renameBoundary + ); + + gtk_widget_show(notebook1); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + mainWindowPtr_, + mainWindowPtr_, + "Mesh generation GUI" + ); + + GLADE_HOOKUP_OBJECT + ( + mainWindowPtr_, + button_mainWindow_save, + "button_mainWindow_save" + ); + GLADE_HOOKUP_OBJECT + ( + mainWindowPtr_, + button_mainWindow_exit, + "button_mainWindow_exit" + ); + + gtk_widget_show(mainWindowPtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKObjectRefinementMainWindow.C b/GUI/meshGenGTK/meshGenGTKObjectRefinementMainWindow.C index fca11f9..c24e385 100644 --- a/GUI/meshGenGTK/meshGenGTKObjectRefinementMainWindow.C +++ b/GUI/meshGenGTK/meshGenGTKObjectRefinementMainWindow.C @@ -37,80 +37,80 @@ namespace Foam void meshGenGTK::createObjectRefinementMainWindowPage() { - //- create pages within this page - createBoxRefinementWindowPage(); - createLineRefinementWindowPage(); - createConeRefinementWindowPage(); - createSphereRefinementWindowPage(); - - objectRefinementMainFramePtr_ = gtk_frame_new(NULL); - - GtkWidget* notebook1 = gtk_notebook_new (); + //- create pages within this page + createBoxRefinementWindowPage(); + createLineRefinementWindowPage(); + createConeRefinementWindowPage(); + createSphereRefinementWindowPage(); + + objectRefinementMainFramePtr_ = gtk_frame_new(NULL); + + GtkWidget* notebook1 = gtk_notebook_new (); - gtk_container_add(GTK_CONTAINER(objectRefinementMainFramePtr_), notebook1); - - //- add page for box refinement - GtkWidget* label_boxRefinement = gtk_label_new("Box refinement"); - gtk_widget_show(label_boxRefinement); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - boxRefinementFramePtr_, - label_boxRefinement - ); - - //- add page for line refinement - GtkWidget* label_lineRefinement = gtk_label_new("Line refinement"); - gtk_widget_show(label_lineRefinement); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - lineRefinementFramePtr_, - label_lineRefinement - ); - - //- add page for cone refinement - GtkWidget* label_coneRefinement = gtk_label_new("Cone refinement"); - gtk_widget_show(label_coneRefinement); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - coneRefinementFramePtr_, - label_coneRefinement - ); - - //- add page for sphere refinement - GtkWidget* label_sphereRefinement = gtk_label_new("Sphere refinement"); - gtk_widget_show(label_sphereRefinement); - - gtk_notebook_append_page - ( - GTK_NOTEBOOK(notebook1), - sphereRefinementFramePtr_, - label_sphereRefinement - ); - - //- show the notebook - gtk_widget_show(notebook1); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - objectRefinementMainFramePtr_, - objectRefinementMainFramePtr_, - "objectRefinementMainFramePtr_" - ); - GLADE_HOOKUP_OBJECT - ( - objectRefinementMainFramePtr_, - notebook1, - "notebook1" - ); + gtk_container_add(GTK_CONTAINER(objectRefinementMainFramePtr_), notebook1); + + //- add page for box refinement + GtkWidget* label_boxRefinement = gtk_label_new("Box refinement"); + gtk_widget_show(label_boxRefinement); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + boxRefinementFramePtr_, + label_boxRefinement + ); + + //- add page for line refinement + GtkWidget* label_lineRefinement = gtk_label_new("Line refinement"); + gtk_widget_show(label_lineRefinement); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + lineRefinementFramePtr_, + label_lineRefinement + ); + + //- add page for cone refinement + GtkWidget* label_coneRefinement = gtk_label_new("Cone refinement"); + gtk_widget_show(label_coneRefinement); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + coneRefinementFramePtr_, + label_coneRefinement + ); + + //- add page for sphere refinement + GtkWidget* label_sphereRefinement = gtk_label_new("Sphere refinement"); + gtk_widget_show(label_sphereRefinement); + + gtk_notebook_append_page + ( + GTK_NOTEBOOK(notebook1), + sphereRefinementFramePtr_, + label_sphereRefinement + ); + + //- show the notebook + gtk_widget_show(notebook1); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + objectRefinementMainFramePtr_, + objectRefinementMainFramePtr_, + "objectRefinementMainFramePtr_" + ); + GLADE_HOOKUP_OBJECT + ( + objectRefinementMainFramePtr_, + notebook1, + "notebook1" + ); - gtk_widget_show(objectRefinementMainFramePtr_); + gtk_widget_show(objectRefinementMainFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKRenameBoundary.C b/GUI/meshGenGTK/meshGenGTKRenameBoundary.C index d48a043..23efe17 100644 --- a/GUI/meshGenGTK/meshGenGTKRenameBoundary.C +++ b/GUI/meshGenGTK/meshGenGTKRenameBoundary.C @@ -35,726 +35,726 @@ Description namespace Foam { - + extern "C" { static void resetNewPatchNamesForSelectedPatch ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* comboboxentry_renameBoundary_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "comboboxentry_renameBoundary_selectedPatches" - ); - GtkWidget* entry_renameBoundary_selectedPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_selectedPatchName" - ); - GtkWidget* entry_renameBoundary_selectedPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_selectedPatchType" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_renameBoundary_selectedPatches)->entry - ) - ); - - const PtrList newPatchNames = guiPtr->newPatchNames(); - forAll(newPatchNames, nameI) - if( newPatchNames[nameI].keyword() == name ) - { - const dictionary dict = newPatchNames[nameI].dict(); - - dictionary newDict; - if( widget == entry_renameBoundary_selectedPatchName ) - { - const word newName = - gtk_entry_get_text - ( - GTK_ENTRY(entry_renameBoundary_selectedPatchName) - ); - word type("patch"); - if( dict.found("type") ) - { - type = word(dict.lookup("type")); - } - newDict.add("newName", newName); - newDict.add("type", type); - } - else - { - const word newName(dict.lookup("newName")); - const word type = - gtk_entry_get_text - ( - GTK_ENTRY(entry_renameBoundary_selectedPatchType) - ); - newDict.add("newName", newName); - newDict.add("type", type); - } - - guiPtr->removePatchName(name); - guiPtr->addNewPatchName(name, newDict); - } + GtkWidget* comboboxentry_renameBoundary_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "comboboxentry_renameBoundary_selectedPatches" + ); + GtkWidget* entry_renameBoundary_selectedPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_selectedPatchName" + ); + GtkWidget* entry_renameBoundary_selectedPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_selectedPatchType" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_renameBoundary_selectedPatches)->entry + ) + ); + + const PtrList newPatchNames = guiPtr->newPatchNames(); + forAll(newPatchNames, nameI) + if( newPatchNames[nameI].keyword() == name ) + { + const dictionary dict = newPatchNames[nameI].dict(); + + dictionary newDict; + if( widget == entry_renameBoundary_selectedPatchName ) + { + const word newName = + gtk_entry_get_text + ( + GTK_ENTRY(entry_renameBoundary_selectedPatchName) + ); + word type("patch"); + if( dict.found("type") ) + { + type = word(dict.lookup("type")); + } + newDict.add("newName", newName); + newDict.add("type", type); + } + else + { + const word newName(dict.lookup("newName")); + const word type = + gtk_entry_get_text + ( + GTK_ENTRY(entry_renameBoundary_selectedPatchType) + ); + newDict.add("newName", newName); + newDict.add("type", type); + } + + guiPtr->removePatchName(name); + guiPtr->addNewPatchName(name, newDict); + } } static void updateNewPatchNamesForSelectedPatch ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* comboboxentry_renameBoundary_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "comboboxentry_renameBoundary_selectedPatches" - ); - GtkWidget* entry_renameBoundary_selectedPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_selectedPatchName" - ); - GtkWidget* entry_renameBoundary_selectedPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_selectedPatchType" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_renameBoundary_selectedPatches)->entry - ) - ); - - if( name == "" ) - { - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_selectedPatchName), "" - ); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_selectedPatchType), "" - ); - - return; - } - - const PtrList newPatchNames = guiPtr->newPatchNames(); - forAll(newPatchNames, nameI) - if( newPatchNames[nameI].keyword() == name ) - { - const dictionary dict = newPatchNames[nameI].dict(); - - const word newName(dict.lookup("newName")); - word type("patch"); - if( dict.found("type") ) - { - type = word(dict.lookup("type")); - } - - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_selectedPatchName), - newName.c_str() - ); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_selectedPatchType), - type.c_str() - ); - } + GtkWidget* comboboxentry_renameBoundary_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "comboboxentry_renameBoundary_selectedPatches" + ); + GtkWidget* entry_renameBoundary_selectedPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_selectedPatchName" + ); + GtkWidget* entry_renameBoundary_selectedPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_selectedPatchType" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_renameBoundary_selectedPatches)->entry + ) + ); + + if( name == "" ) + { + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_selectedPatchName), "" + ); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_selectedPatchType), "" + ); + + return; + } + + const PtrList newPatchNames = guiPtr->newPatchNames(); + forAll(newPatchNames, nameI) + if( newPatchNames[nameI].keyword() == name ) + { + const dictionary dict = newPatchNames[nameI].dict(); + + const word newName(dict.lookup("newName")); + word type("patch"); + if( dict.found("type") ) + { + type = word(dict.lookup("type")); + } + + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_selectedPatchName), + newName.c_str() + ); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_selectedPatchType), + type.c_str() + ); + } } - + static void updateNewPatchNames ( - GtkWidget* renameBoundaryFramePtr + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* comboboxentry_renameBoundary_availablePatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "comboboxentry_renameBoundary_availablePatches" - ); - GtkWidget* comboboxentry_renameBoundary_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "comboboxentry_renameBoundary_selectedPatches" - ); - - if( guiPtr->newPatchNamesEntryExist() ) - { - wordHashSet selectedPatches; - PtrList newPatchNames = guiPtr->newPatchNames(); - forAll(newPatchNames, pI) - selectedPatches.insert(newPatchNames[pI].keyword()); - - label nAvailable(0); - GList* avPatches = 0; - const triSurface& surf = guiPtr->surface(); - forAll(surf.patches(), patchI) - { - if( selectedPatches.found(surf.patches()[patchI].name()) ) - continue; - - ++nAvailable; - const char* name = surf.patches()[patchI].name().c_str(); - avPatches = g_list_append(avPatches, const_cast(name)); - } - - if( nAvailable == 0 ) - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_availablePatches - )->entry - ), - "" - ); - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_availablePatches - ), avPatches - ); - - g_list_free(avPatches); - - GList* selPatches = 0; - forAll(newPatchNames, nameI) - { - const char* name = newPatchNames[nameI].keyword().c_str(); - selPatches = g_list_append(selPatches, const_cast(name)); - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_selectedPatches - ), selPatches - ); - - g_list_free(selPatches); - - if( nAvailable == newPatchNames.size() ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_selectedPatches - )->entry - ), - "" - ); - } - } - else - { - GList* avPatches = 0; - - const triSurface& surf = guiPtr->surface(); - forAll(surf.patches(), patchI) - { - const char* name = surf.patches()[patchI].name().c_str(); - avPatches = g_list_append(avPatches, const_cast(name)); - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_availablePatches - ), avPatches - ); - - g_list_free(avPatches); - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_selectedPatches - ), avPatches - ); - - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_renameBoundary_selectedPatches)->entry - ), - "" - ); - } - - updateNewPatchNamesForSelectedPatch(NULL, renameBoundaryFramePtr); + GtkWidget* comboboxentry_renameBoundary_availablePatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "comboboxentry_renameBoundary_availablePatches" + ); + GtkWidget* comboboxentry_renameBoundary_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "comboboxentry_renameBoundary_selectedPatches" + ); + + if( guiPtr->newPatchNamesEntryExist() ) + { + wordHashSet selectedPatches; + PtrList newPatchNames = guiPtr->newPatchNames(); + forAll(newPatchNames, pI) + selectedPatches.insert(newPatchNames[pI].keyword()); + + label nAvailable(0); + GList* avPatches = 0; + const triSurface& surf = guiPtr->surface(); + forAll(surf.patches(), patchI) + { + if( selectedPatches.found(surf.patches()[patchI].name()) ) + continue; + + ++nAvailable; + const char* name = surf.patches()[patchI].name().c_str(); + avPatches = g_list_append(avPatches, const_cast(name)); + } + + if( nAvailable == 0 ) + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_availablePatches + )->entry + ), + "" + ); + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_availablePatches + ), avPatches + ); + + g_list_free(avPatches); + + GList* selPatches = 0; + forAll(newPatchNames, nameI) + { + const char* name = newPatchNames[nameI].keyword().c_str(); + selPatches = g_list_append(selPatches, const_cast(name)); + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_selectedPatches + ), selPatches + ); + + g_list_free(selPatches); + + if( nAvailable == newPatchNames.size() ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_selectedPatches + )->entry + ), + "" + ); + } + } + else + { + GList* avPatches = 0; + + const triSurface& surf = guiPtr->surface(); + forAll(surf.patches(), patchI) + { + const char* name = surf.patches()[patchI].name().c_str(); + avPatches = g_list_append(avPatches, const_cast(name)); + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_availablePatches + ), avPatches + ); + + g_list_free(avPatches); + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_selectedPatches + ), avPatches + ); + + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_renameBoundary_selectedPatches)->entry + ), + "" + ); + } + + updateNewPatchNamesForSelectedPatch(NULL, renameBoundaryFramePtr); } static void setDefaultValues(GtkWidget* renameBoundaryFramePtr) { - GtkWidget* checkbutton_renameBoundary_defaultPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "checkbutton_renameBoundary_defaultPatchName" - ); - GtkWidget* entry_renameBoundary_defaultPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_defaultPatchName" - ); - GtkWidget* checkbutton_renameBoundary_defaultPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "checkbutton_renameBoundary_defaultPatchType" - ); - GtkWidget* entry_renameBoundary_defaultPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_defaultPatchType" - ); - - if( guiPtr->defaultPatchNameEntryExist() ) - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName), - 1 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_defaultPatchName), 1 - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchName), - guiPtr->defaultPatchName().c_str() - ); - } - else - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName), - 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_defaultPatchName), 0 - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchName), - "" - ); - } - - if( guiPtr->defaultPatchTypeEntryExist() ) - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType), - 1 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_defaultPatchType), 1 - ); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchType), - guiPtr->defaultPatchType().c_str() - ); - } - else - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType), - 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_defaultPatchType), 0 - ); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchType), - "" - ); - } + GtkWidget* checkbutton_renameBoundary_defaultPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "checkbutton_renameBoundary_defaultPatchName" + ); + GtkWidget* entry_renameBoundary_defaultPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_defaultPatchName" + ); + GtkWidget* checkbutton_renameBoundary_defaultPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "checkbutton_renameBoundary_defaultPatchType" + ); + GtkWidget* entry_renameBoundary_defaultPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_defaultPatchType" + ); + + if( guiPtr->defaultPatchNameEntryExist() ) + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName), + 1 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_defaultPatchName), 1 + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchName), + guiPtr->defaultPatchName().c_str() + ); + } + else + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName), + 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_defaultPatchName), 0 + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchName), + "" + ); + } + + if( guiPtr->defaultPatchTypeEntryExist() ) + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType), + 1 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_defaultPatchType), 1 + ); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchType), + guiPtr->defaultPatchType().c_str() + ); + } + else + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType), + 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_defaultPatchType), 0 + ); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchType), + "" + ); + } } static void useDefaultPatchName ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* checkbutton_renameBoundary_defaultPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "checkbutton_renameBoundary_defaultPatchName" - ); - GtkWidget* entry_renameBoundary_defaultPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_defaultPatchName" - ); - - if( guiPtr->defaultPatchNameEntryExist() ) - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName), 0 - ); - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_defaultPatchName), 0 - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchName), "" - ); - guiPtr->removeDefaultPatchName(); - } - else - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName), 1 - ); - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_defaultPatchName), 1 - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchName), "defaultFaces" - ); - guiPtr->setDefaultPatchName("defaultFaces"); - } + GtkWidget* checkbutton_renameBoundary_defaultPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "checkbutton_renameBoundary_defaultPatchName" + ); + GtkWidget* entry_renameBoundary_defaultPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_defaultPatchName" + ); + + if( guiPtr->defaultPatchNameEntryExist() ) + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName), 0 + ); + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_defaultPatchName), 0 + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchName), "" + ); + guiPtr->removeDefaultPatchName(); + } + else + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName), 1 + ); + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_defaultPatchName), 1 + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchName), "defaultFaces" + ); + guiPtr->setDefaultPatchName("defaultFaces"); + } } static void setDefaultPatchName ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* checkbutton_renameBoundary_defaultPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "checkbutton_renameBoundary_defaultPatchName" - ); - GtkWidget* entry_renameBoundary_defaultPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_defaultPatchName" - ); - - if( - gtk_toggle_button_get_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName) - ) - ) - { - const word name = - gtk_entry_get_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchName) - ); - - guiPtr->setDefaultPatchName(name); - } + GtkWidget* checkbutton_renameBoundary_defaultPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "checkbutton_renameBoundary_defaultPatchName" + ); + GtkWidget* entry_renameBoundary_defaultPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_defaultPatchName" + ); + + if( + gtk_toggle_button_get_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchName) + ) + ) + { + const word name = + gtk_entry_get_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchName) + ); + + guiPtr->setDefaultPatchName(name); + } } static void useDefaultPatchType ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* checkbutton_renameBoundary_defaultPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "checkbutton_renameBoundary_defaultPatchType" - ); - GtkWidget* entry_renameBoundary_defaultPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_defaultPatchType" - ); - - if( guiPtr->defaultPatchTypeEntryExist() ) - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType), 0 - ); - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_defaultPatchType), 0 - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchType), "" - ); - guiPtr->removeDefaultPatchType(); - } - else - { - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType), 1 - ); - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_defaultPatchType), 1 - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchType), "patch" - ); - guiPtr->setDefaultPatchType("patch"); - } + GtkWidget* checkbutton_renameBoundary_defaultPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "checkbutton_renameBoundary_defaultPatchType" + ); + GtkWidget* entry_renameBoundary_defaultPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_defaultPatchType" + ); + + if( guiPtr->defaultPatchTypeEntryExist() ) + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType), 0 + ); + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_defaultPatchType), 0 + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchType), "" + ); + guiPtr->removeDefaultPatchType(); + } + else + { + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType), 1 + ); + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_defaultPatchType), 1 + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchType), "patch" + ); + guiPtr->setDefaultPatchType("patch"); + } } static void setDefaultPatchType ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* checkbutton_renameBoundary_defaultPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "checkbutton_renameBoundary_defaultPatchType" - ); - GtkWidget* entry_renameBoundary_defaultPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_defaultPatchType" - ); - - if( - gtk_toggle_button_get_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType) - ) - ) - { - const word pType = - gtk_entry_get_text - ( - GTK_ENTRY(entry_renameBoundary_defaultPatchType) - ); - - guiPtr->setDefaultPatchType(pType); - } + GtkWidget* checkbutton_renameBoundary_defaultPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "checkbutton_renameBoundary_defaultPatchType" + ); + GtkWidget* entry_renameBoundary_defaultPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_defaultPatchType" + ); + + if( + gtk_toggle_button_get_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_defaultPatchType) + ) + ) + { + const word pType = + gtk_entry_get_text + ( + GTK_ENTRY(entry_renameBoundary_defaultPatchType) + ); + + guiPtr->setDefaultPatchType(pType); + } } static void useNewPatchType ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* entry_renameBoundary_newPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_newPatchType" - ); - - Info << "Here " << gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) << endl; - if( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ) - { - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_newPatchType), 1 - ); - } - else - { - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_newPatchType), "" - ); - gtk_editable_set_editable - ( - GTK_EDITABLE(entry_renameBoundary_newPatchType), 0 - ); - } + GtkWidget* entry_renameBoundary_newPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_newPatchType" + ); + + Info << "Here " << gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) << endl; + if( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ) + { + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_newPatchType), 1 + ); + } + else + { + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_newPatchType), "" + ); + gtk_editable_set_editable + ( + GTK_EDITABLE(entry_renameBoundary_newPatchType), 0 + ); + } } static void addNewPatchName ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* comboboxentry_renameBoundary_availablePatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "comboboxentry_renameBoundary_availablePatches" - ); - GtkWidget* entry_renameBoundary_newPatchName = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_newPatchName" - ); - GtkWidget* checkbutton_renameBoundary_newPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "checkbutton_renameBoundary_newPatchType" - ); - GtkWidget* entry_renameBoundary_newPatchType = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "entry_renameBoundary_newPatchType" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_availablePatches - )->entry - ) - ); - - if( name == "" ) - return; + GtkWidget* comboboxentry_renameBoundary_availablePatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "comboboxentry_renameBoundary_availablePatches" + ); + GtkWidget* entry_renameBoundary_newPatchName = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_newPatchName" + ); + GtkWidget* checkbutton_renameBoundary_newPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "checkbutton_renameBoundary_newPatchType" + ); + GtkWidget* entry_renameBoundary_newPatchType = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "entry_renameBoundary_newPatchType" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_availablePatches + )->entry + ) + ); + + if( name == "" ) + return; - const word newName = - gtk_entry_get_text - ( - GTK_ENTRY(entry_renameBoundary_newPatchName) - ); - gtk_entry_set_text(GTK_ENTRY(entry_renameBoundary_newPatchName), ""); - - word newType("patch"); - if( - gtk_toggle_button_get_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_newPatchType) - ) - ) - { - newType = - gtk_entry_get_text - ( - GTK_ENTRY(entry_renameBoundary_newPatchType) - ); - - gtk_toggle_button_set_active - ( - GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_newPatchType), 0 - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_renameBoundary_newPatchType), "" - ); - } - - dictionary dict; - dict.add("newName", newName); - dict.add("type", newType); - guiPtr->addNewPatchName(name, dict); - - updateNewPatchNames(renameBoundaryFramePtr); + const word newName = + gtk_entry_get_text + ( + GTK_ENTRY(entry_renameBoundary_newPatchName) + ); + gtk_entry_set_text(GTK_ENTRY(entry_renameBoundary_newPatchName), ""); + + word newType("patch"); + if( + gtk_toggle_button_get_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_newPatchType) + ) + ) + { + newType = + gtk_entry_get_text + ( + GTK_ENTRY(entry_renameBoundary_newPatchType) + ); + + gtk_toggle_button_set_active + ( + GTK_TOGGLE_BUTTON(checkbutton_renameBoundary_newPatchType), 0 + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_renameBoundary_newPatchType), "" + ); + } + + dictionary dict; + dict.add("newName", newName); + dict.add("type", newType); + guiPtr->addNewPatchName(name, dict); + + updateNewPatchNames(renameBoundaryFramePtr); } static void removeNewPatchName ( - GtkWidget* widget, - GtkWidget* renameBoundaryFramePtr + GtkWidget* widget, + GtkWidget* renameBoundaryFramePtr ) { - GtkWidget* comboboxentry_renameBoundary_selectedPatches = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(renameBoundaryFramePtr), - "comboboxentry_renameBoundary_selectedPatches" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_selectedPatches - )->entry - ) - ); - - if( name == "" ) - return; - - guiPtr->removePatchName(name); - - updateNewPatchNames(renameBoundaryFramePtr); + GtkWidget* comboboxentry_renameBoundary_selectedPatches = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(renameBoundaryFramePtr), + "comboboxentry_renameBoundary_selectedPatches" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_selectedPatches + )->entry + ) + ); + + if( name == "" ) + return; + + guiPtr->removePatchName(name); + + updateNewPatchNames(renameBoundaryFramePtr); } } @@ -763,469 +763,469 @@ static void removeNewPatchName void meshGenGTK::createRenameBoundaryMainWindowPage() { - guiPtr = &meshGui_; - - renameBoundaryFramePtr_ = gtk_frame_new(NULL); + guiPtr = &meshGui_; + + renameBoundaryFramePtr_ = gtk_frame_new(NULL); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a table - GtkWidget* table1 = gtk_table_new(3, 10, FALSE); - gtk_widget_show(table1); - gtk_container_add - ( - GTK_CONTAINER(renameBoundaryFramePtr_), - table1 - ); - + //- create a table + GtkWidget* table1 = gtk_table_new(3, 10, FALSE); + gtk_widget_show(table1); + gtk_container_add + ( + GTK_CONTAINER(renameBoundaryFramePtr_), + table1 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a check button for default patch name - GtkWidget* checkbutton_renameBoundary_defaultPatchName = - gtk_check_button_new_with_mnemonic - ( - "Default patch name" - ); - gtk_widget_show(checkbutton_renameBoundary_defaultPatchName); - - gtk_table_attach(GTK_TABLE(table1), - checkbutton_renameBoundary_defaultPatchName, 0, 1, 0, 1, + //- create a check button for default patch name + GtkWidget* checkbutton_renameBoundary_defaultPatchName = + gtk_check_button_new_with_mnemonic + ( + "Default patch name" + ); + gtk_widget_show(checkbutton_renameBoundary_defaultPatchName); + + gtk_table_attach(GTK_TABLE(table1), + checkbutton_renameBoundary_defaultPatchName, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create the entry for default patch name - GtkWidget* entry_renameBoundary_defaultPatchName = gtk_entry_new(); - gtk_widget_show(entry_renameBoundary_defaultPatchName); - - gtk_table_attach(GTK_TABLE(table1), - entry_renameBoundary_defaultPatchName, 1, 2, 0, 1, + //- create the entry for default patch name + GtkWidget* entry_renameBoundary_defaultPatchName = gtk_entry_new(); + gtk_widget_show(entry_renameBoundary_defaultPatchName); + + gtk_table_attach(GTK_TABLE(table1), + entry_renameBoundary_defaultPatchName, 1, 2, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a check button for default patch type - GtkWidget* checkbutton_renameBoundary_defaultPatchType = - gtk_check_button_new_with_mnemonic - ( - "Default patch type" - ); - gtk_widget_show(checkbutton_renameBoundary_defaultPatchType); - - gtk_table_attach(GTK_TABLE(table1), - checkbutton_renameBoundary_defaultPatchType, 0, 1, 1, 2, + //- create a check button for default patch type + GtkWidget* checkbutton_renameBoundary_defaultPatchType = + gtk_check_button_new_with_mnemonic + ( + "Default patch type" + ); + gtk_widget_show(checkbutton_renameBoundary_defaultPatchType); + + gtk_table_attach(GTK_TABLE(table1), + checkbutton_renameBoundary_defaultPatchType, 0, 1, 1, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create the entry for default patch type - GtkWidget* entry_renameBoundary_defaultPatchType = gtk_entry_new(); - gtk_widget_show(entry_renameBoundary_defaultPatchType); - - gtk_table_attach(GTK_TABLE(table1), - entry_renameBoundary_defaultPatchType, 1, 2, 1, 2, + //- create the entry for default patch type + GtkWidget* entry_renameBoundary_defaultPatchType = gtk_entry_new(); + gtk_widget_show(entry_renameBoundary_defaultPatchType); + + gtk_table_attach(GTK_TABLE(table1), + entry_renameBoundary_defaultPatchType, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a horizontal separator - GtkWidget* hseparator = gtk_hseparator_new(); - gtk_widget_show(hseparator); - gtk_table_attach(GTK_TABLE(table1), hseparator, 0, 3, 2, 3, + //- add a horizontal separator + GtkWidget* hseparator = gtk_hseparator_new(); + gtk_widget_show(hseparator); + gtk_table_attach(GTK_TABLE(table1), hseparator, 0, 3, 2, 3, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); - + 0, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a label for available patches - GtkWidget* label_renameBoundary_availablePatches = - gtk_label_new("Available patches"); - gtk_widget_show(label_renameBoundary_availablePatches); - - gtk_table_attach(GTK_TABLE(table1), - label_renameBoundary_availablePatches, 0, 1, 3, 4, + //- add a label for available patches + GtkWidget* label_renameBoundary_availablePatches = + gtk_label_new("Available patches"); + gtk_widget_show(label_renameBoundary_availablePatches); + + gtk_table_attach(GTK_TABLE(table1), + label_renameBoundary_availablePatches, 0, 1, 3, 4, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a combo box for available patches - GtkWidget* comboboxentry_renameBoundary_availablePatches = - gtk_combo_new(); - gtk_widget_show(comboboxentry_renameBoundary_availablePatches); - - gtk_table_attach(GTK_TABLE(table1), - comboboxentry_renameBoundary_availablePatches, 1, 2, 3, 4, + //- add a combo box for available patches + GtkWidget* comboboxentry_renameBoundary_availablePatches = + gtk_combo_new(); + gtk_widget_show(comboboxentry_renameBoundary_availablePatches); + + gtk_table_attach(GTK_TABLE(table1), + comboboxentry_renameBoundary_availablePatches, 1, 2, 3, 4, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_availablePatches - )->entry - ), - 0 - ); - + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_availablePatches + )->entry + ), + 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a label for new patch name - GtkWidget* label_renameBoundary_newPatchName = - gtk_label_new("New name"); - gtk_widget_show(label_renameBoundary_newPatchName); - - gtk_table_attach(GTK_TABLE(table1), - label_renameBoundary_newPatchName, 0, 1, 4, 5, + //- add a label for new patch name + GtkWidget* label_renameBoundary_newPatchName = + gtk_label_new("New name"); + gtk_widget_show(label_renameBoundary_newPatchName); + + gtk_table_attach(GTK_TABLE(table1), + label_renameBoundary_newPatchName, 0, 1, 4, 5, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add the entry for new patch name - GtkWidget* entry_renameBoundary_newPatchName = gtk_entry_new(); - gtk_widget_show(entry_renameBoundary_newPatchName); - - gtk_table_attach(GTK_TABLE(table1), - entry_renameBoundary_newPatchName, 1, 2, 4, 5, + //- add the entry for new patch name + GtkWidget* entry_renameBoundary_newPatchName = gtk_entry_new(); + gtk_widget_show(entry_renameBoundary_newPatchName); + + gtk_table_attach(GTK_TABLE(table1), + entry_renameBoundary_newPatchName, 1, 2, 4, 5, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a check button for new patch type - GtkWidget* checkbutton_renameBoundary_newPatchType = - gtk_check_button_new_with_mnemonic - ( - "New type" - ); - gtk_widget_show(checkbutton_renameBoundary_newPatchType); - - gtk_table_attach(GTK_TABLE(table1), - checkbutton_renameBoundary_newPatchType, 0, 1, 5, 6, + //- add a check button for new patch type + GtkWidget* checkbutton_renameBoundary_newPatchType = + gtk_check_button_new_with_mnemonic + ( + "New type" + ); + gtk_widget_show(checkbutton_renameBoundary_newPatchType); + + gtk_table_attach(GTK_TABLE(table1), + checkbutton_renameBoundary_newPatchType, 0, 1, 5, 6, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add the entry for new patch type - GtkWidget* entry_renameBoundary_newPatchType = gtk_entry_new(); - gtk_widget_show(entry_renameBoundary_newPatchType); - - gtk_table_attach(GTK_TABLE(table1), - entry_renameBoundary_newPatchType, 1, 2, 5, 6, + //- add the entry for new patch type + GtkWidget* entry_renameBoundary_newPatchType = gtk_entry_new(); + gtk_widget_show(entry_renameBoundary_newPatchType); + + gtk_table_attach(GTK_TABLE(table1), + entry_renameBoundary_newPatchType, 1, 2, 5, 6, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for adding new patch names - GtkWidget* button1 = gtk_button_new(); - gtk_widget_show(button1); - gtk_table_attach - ( - GTK_TABLE(table1), - button1, - 2, 3, 3, 6, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 3 - ); + //- set the button for adding new patch names + GtkWidget* button1 = gtk_button_new(); + gtk_widget_show(button1); + gtk_table_attach + ( + GTK_TABLE(table1), + button1, + 2, 3, 3, 6, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 3 + ); - GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(button1), alignment1); - - GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox1); - gtk_container_add(GTK_CONTAINER(alignment1), hbox1); - - GtkWidget* image1 = - gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); - - GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); - gtk_widget_show(label3); - gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); - + GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(button1), alignment1); + + GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox1); + gtk_container_add(GTK_CONTAINER(alignment1), hbox1); + + GtkWidget* image1 = + gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); + + GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); + gtk_widget_show(label3); + gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a horizontal separator - hseparator = gtk_hseparator_new(); - gtk_widget_show(hseparator); - gtk_table_attach(GTK_TABLE(table1), hseparator, 0, 3, 6, 7, + //- add a horizontal separator + hseparator = gtk_hseparator_new(); + gtk_widget_show(hseparator); + gtk_table_attach(GTK_TABLE(table1), hseparator, 0, 3, 6, 7, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); + 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a label for selected patches - GtkWidget* label_renameBoundary_selectedPatches = - gtk_label_new("Selected patches"); - gtk_widget_show(label_renameBoundary_selectedPatches); - - gtk_table_attach(GTK_TABLE(table1), - label_renameBoundary_selectedPatches, 0, 1, 7, 8, + //- add a label for selected patches + GtkWidget* label_renameBoundary_selectedPatches = + gtk_label_new("Selected patches"); + gtk_widget_show(label_renameBoundary_selectedPatches); + + gtk_table_attach(GTK_TABLE(table1), + label_renameBoundary_selectedPatches, 0, 1, 7, 8, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a combo box for selected patches - GtkWidget* comboboxentry_renameBoundary_selectedPatches = - gtk_combo_new(); - gtk_widget_show(comboboxentry_renameBoundary_selectedPatches); - - gtk_table_attach(GTK_TABLE(table1), - comboboxentry_renameBoundary_selectedPatches, 1, 2, 7, 8, + //- add a combo box for selected patches + GtkWidget* comboboxentry_renameBoundary_selectedPatches = + gtk_combo_new(); + gtk_widget_show(comboboxentry_renameBoundary_selectedPatches); + + gtk_table_attach(GTK_TABLE(table1), + comboboxentry_renameBoundary_selectedPatches, 1, 2, 7, 8, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO - ( - comboboxentry_renameBoundary_selectedPatches - )->entry - ), - 0 - ); - + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO + ( + comboboxentry_renameBoundary_selectedPatches + )->entry + ), + 0 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a label for new patch name - GtkWidget* label_renameBoundary_selectedPatchName = - gtk_label_new("New name"); - gtk_widget_show(label_renameBoundary_selectedPatchName); - - gtk_table_attach(GTK_TABLE(table1), - label_renameBoundary_selectedPatchName, 0, 1, 8, 9, + //- add a label for new patch name + GtkWidget* label_renameBoundary_selectedPatchName = + gtk_label_new("New name"); + gtk_widget_show(label_renameBoundary_selectedPatchName); + + gtk_table_attach(GTK_TABLE(table1), + label_renameBoundary_selectedPatchName, 0, 1, 8, 9, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add the entry for selected patch name - GtkWidget* entry_renameBoundary_selectedPatchName = gtk_entry_new(); - gtk_widget_show(entry_renameBoundary_selectedPatchName); - - gtk_table_attach(GTK_TABLE(table1), - entry_renameBoundary_selectedPatchName, 1, 2, 8, 9, + //- add the entry for selected patch name + GtkWidget* entry_renameBoundary_selectedPatchName = gtk_entry_new(); + gtk_widget_show(entry_renameBoundary_selectedPatchName); + + gtk_table_attach(GTK_TABLE(table1), + entry_renameBoundary_selectedPatchName, 1, 2, 8, 9, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add a label for selected patch type - GtkWidget* label_renameBoundary_selectedPatchType = - gtk_label_new - ( - "New type" - ); - gtk_widget_show(label_renameBoundary_selectedPatchType); - - gtk_table_attach(GTK_TABLE(table1), - label_renameBoundary_selectedPatchType, 0, 1, 9, 10, + //- add a label for selected patch type + GtkWidget* label_renameBoundary_selectedPatchType = + gtk_label_new + ( + "New type" + ); + gtk_widget_show(label_renameBoundary_selectedPatchType); + + gtk_table_attach(GTK_TABLE(table1), + label_renameBoundary_selectedPatchType, 0, 1, 9, 10, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- add the entry for selected patch type - GtkWidget* entry_renameBoundary_selectedPatchType = gtk_entry_new(); - gtk_widget_show(entry_renameBoundary_selectedPatchType); - - gtk_table_attach(GTK_TABLE(table1), - entry_renameBoundary_selectedPatchType, 1, 2, 9, 10, + //- add the entry for selected patch type + GtkWidget* entry_renameBoundary_selectedPatchType = gtk_entry_new(); + gtk_widget_show(entry_renameBoundary_selectedPatchType); + + gtk_table_attach(GTK_TABLE(table1), + entry_renameBoundary_selectedPatchType, 1, 2, 9, 10, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for removing new patch names - GtkWidget* button2 = gtk_button_new(); - gtk_widget_show(button2); - gtk_table_attach - ( - GTK_TABLE(table1), - button2, - 2, 3, 7, 10, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment2); - gtk_container_add(GTK_CONTAINER(button2), alignment2); - - GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox2); - gtk_container_add(GTK_CONTAINER(alignment2), hbox2); - - GtkWidget* image2 = - gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image2); - gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); - - GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); - + //- set the button for removing new patch names + GtkWidget* button2 = gtk_button_new(); + gtk_widget_show(button2); + gtk_table_attach + ( + GTK_TABLE(table1), + button2, + 2, 3, 7, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment2); + gtk_container_add(GTK_CONTAINER(button2), alignment2); + + GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox2); + gtk_container_add(GTK_CONTAINER(alignment2), hbox2); + + GtkWidget* image2 = + gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image2); + gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); + + GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); + gtk_widget_show(label5); + gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - GLADE_HOOKUP_OBJECT_NO_REF - ( - renameBoundaryFramePtr_, - renameBoundaryFramePtr_, - "renameBoundaryFramePtr_" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - checkbutton_renameBoundary_defaultPatchName, - "checkbutton_renameBoundary_defaultPatchName" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - entry_renameBoundary_defaultPatchName, - "entry_renameBoundary_defaultPatchName" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - checkbutton_renameBoundary_defaultPatchType, - "checkbutton_renameBoundary_defaultPatchType" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - entry_renameBoundary_defaultPatchType, - "entry_renameBoundary_defaultPatchType" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - comboboxentry_renameBoundary_availablePatches, - "comboboxentry_renameBoundary_availablePatches" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - entry_renameBoundary_newPatchName, - "entry_renameBoundary_newPatchName" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - checkbutton_renameBoundary_newPatchType, - "checkbutton_renameBoundary_newPatchType" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - entry_renameBoundary_newPatchType, - "entry_renameBoundary_newPatchType" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - comboboxentry_renameBoundary_selectedPatches, - "comboboxentry_renameBoundary_selectedPatches" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - entry_renameBoundary_selectedPatchName, - "entry_renameBoundary_selectedPatchName" - ); - GLADE_HOOKUP_OBJECT - ( - renameBoundaryFramePtr_, - entry_renameBoundary_selectedPatchType, - "entry_renameBoundary_selectedPatchType" - ); - + GLADE_HOOKUP_OBJECT_NO_REF + ( + renameBoundaryFramePtr_, + renameBoundaryFramePtr_, + "renameBoundaryFramePtr_" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + checkbutton_renameBoundary_defaultPatchName, + "checkbutton_renameBoundary_defaultPatchName" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + entry_renameBoundary_defaultPatchName, + "entry_renameBoundary_defaultPatchName" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + checkbutton_renameBoundary_defaultPatchType, + "checkbutton_renameBoundary_defaultPatchType" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + entry_renameBoundary_defaultPatchType, + "entry_renameBoundary_defaultPatchType" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + comboboxentry_renameBoundary_availablePatches, + "comboboxentry_renameBoundary_availablePatches" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + entry_renameBoundary_newPatchName, + "entry_renameBoundary_newPatchName" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + checkbutton_renameBoundary_newPatchType, + "checkbutton_renameBoundary_newPatchType" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + entry_renameBoundary_newPatchType, + "entry_renameBoundary_newPatchType" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + comboboxentry_renameBoundary_selectedPatches, + "comboboxentry_renameBoundary_selectedPatches" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + entry_renameBoundary_selectedPatchName, + "entry_renameBoundary_selectedPatchName" + ); + GLADE_HOOKUP_OBJECT + ( + renameBoundaryFramePtr_, + entry_renameBoundary_selectedPatchType, + "entry_renameBoundary_selectedPatchType" + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - setDefaultValues(renameBoundaryFramePtr_); - updateNewPatchNames(renameBoundaryFramePtr_); - - g_signal_connect - ( - G_OBJECT - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_renameBoundary_selectedPatches)->entry - ) - ), - "changed", - G_CALLBACK(updateNewPatchNamesForSelectedPatch), - renameBoundaryFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(checkbutton_renameBoundary_defaultPatchName), - "clicked", - G_CALLBACK(useDefaultPatchName), - renameBoundaryFramePtr_ - ); + + setDefaultValues(renameBoundaryFramePtr_); + updateNewPatchNames(renameBoundaryFramePtr_); + + g_signal_connect + ( + G_OBJECT + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_renameBoundary_selectedPatches)->entry + ) + ), + "changed", + G_CALLBACK(updateNewPatchNamesForSelectedPatch), + renameBoundaryFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(checkbutton_renameBoundary_defaultPatchName), + "clicked", + G_CALLBACK(useDefaultPatchName), + renameBoundaryFramePtr_ + ); - g_signal_connect - ( - G_OBJECT(entry_renameBoundary_defaultPatchName), - "changed", - G_CALLBACK(setDefaultPatchName), - renameBoundaryFramePtr_ - ); + g_signal_connect + ( + G_OBJECT(entry_renameBoundary_defaultPatchName), + "changed", + G_CALLBACK(setDefaultPatchName), + renameBoundaryFramePtr_ + ); - g_signal_connect - ( - G_OBJECT(checkbutton_renameBoundary_defaultPatchType), - "clicked", - G_CALLBACK(useDefaultPatchType), - renameBoundaryFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_renameBoundary_defaultPatchType), - "changed", - G_CALLBACK(setDefaultPatchType), - renameBoundaryFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(checkbutton_renameBoundary_newPatchType), - "clicked", - G_CALLBACK(useNewPatchType), - renameBoundaryFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_renameBoundary_selectedPatchName), - "changed", - G_CALLBACK(resetNewPatchNamesForSelectedPatch), - renameBoundaryFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_renameBoundary_selectedPatchType), - "changed", - G_CALLBACK(resetNewPatchNamesForSelectedPatch), - renameBoundaryFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(button1), - "clicked", - G_CALLBACK(addNewPatchName), - renameBoundaryFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(button2), - "clicked", - G_CALLBACK(removeNewPatchName), - renameBoundaryFramePtr_ - ); - - gtk_widget_show(renameBoundaryFramePtr_); + g_signal_connect + ( + G_OBJECT(checkbutton_renameBoundary_defaultPatchType), + "clicked", + G_CALLBACK(useDefaultPatchType), + renameBoundaryFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_renameBoundary_defaultPatchType), + "changed", + G_CALLBACK(setDefaultPatchType), + renameBoundaryFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(checkbutton_renameBoundary_newPatchType), + "clicked", + G_CALLBACK(useNewPatchType), + renameBoundaryFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_renameBoundary_selectedPatchName), + "changed", + G_CALLBACK(resetNewPatchNamesForSelectedPatch), + renameBoundaryFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_renameBoundary_selectedPatchType), + "changed", + G_CALLBACK(resetNewPatchNamesForSelectedPatch), + renameBoundaryFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(button1), + "clicked", + G_CALLBACK(addNewPatchName), + renameBoundaryFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(button2), + "clicked", + G_CALLBACK(removeNewPatchName), + renameBoundaryFramePtr_ + ); + + gtk_widget_show(renameBoundaryFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGTK/meshGenGTKSphereRefinement.C b/GUI/meshGenGTK/meshGenGTKSphereRefinement.C index ec69c6f..8fb3651 100644 --- a/GUI/meshGenGTK/meshGenGTKSphereRefinement.C +++ b/GUI/meshGenGTK/meshGenGTKSphereRefinement.C @@ -43,871 +43,871 @@ extern "C" static void showDataForSphereRefinement ( - GtkWidget* widget, - GtkWidget* sphereRefinementFramePtr + GtkWidget* widget, + GtkWidget* sphereRefinementFramePtr ) { - GtkWidget* comboboxentry_sphereRefinement_createdSpheres = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "comboboxentry_sphereRefinement_createdSpheres" - ); - GtkWidget* entry_sphereRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedCellSize" - ); - GtkWidget* entry_sphereRefinement_selectedCentreX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedCentreX" - ); - GtkWidget* entry_sphereRefinement_selectedCentreY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedCentreY" - ); - GtkWidget* entry_sphereRefinement_selectedCentreZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedCentreZ" - ); - GtkWidget* entry_sphereRefinement_selectedRadius = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedRadius" - ); - - //- find the object in the dictionary - const word sphereName = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_sphereRefinement_createdSpheres)->entry - ) - ); - - const PtrList refs = guiPtr->objectRefinements(); - - forAll(refs, refI) - if( refs[refI].keyword() == sphereName ) - { - const dictionary dict = refs[refI].dict(); - - gtk_entry_set_text - ( - GTK_ENTRY(entry_sphereRefinement_selectedCellSize), - help::scalarToText - ( - scalar(readScalar(dict.lookup("cellSize"))) - ).c_str() - ); - const vector centre(dict.lookup("centre")); - gtk_entry_set_text - ( - GTK_ENTRY(entry_sphereRefinement_selectedCentreX), - help::scalarToText(centre.x()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_sphereRefinement_selectedCentreY), - help::scalarToText(centre.y()).c_str() - ); - gtk_entry_set_text - ( - GTK_ENTRY(entry_sphereRefinement_selectedCentreZ), - help::scalarToText(centre.z()).c_str() - ); - - const scalar radius(readScalar(dict.lookup("radius"))); - gtk_entry_set_text - ( - GTK_ENTRY(entry_sphereRefinement_selectedRadius), - help::scalarToText(radius).c_str() - ); - - return; - } - - gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedCellSize), ""); - gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreX), ""); - gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreY), ""); - gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreZ), ""); - gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedRadius), ""); + GtkWidget* comboboxentry_sphereRefinement_createdSpheres = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "comboboxentry_sphereRefinement_createdSpheres" + ); + GtkWidget* entry_sphereRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedCellSize" + ); + GtkWidget* entry_sphereRefinement_selectedCentreX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedCentreX" + ); + GtkWidget* entry_sphereRefinement_selectedCentreY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedCentreY" + ); + GtkWidget* entry_sphereRefinement_selectedCentreZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedCentreZ" + ); + GtkWidget* entry_sphereRefinement_selectedRadius = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedRadius" + ); + + //- find the object in the dictionary + const word sphereName = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_sphereRefinement_createdSpheres)->entry + ) + ); + + const PtrList refs = guiPtr->objectRefinements(); + + forAll(refs, refI) + if( refs[refI].keyword() == sphereName ) + { + const dictionary dict = refs[refI].dict(); + + gtk_entry_set_text + ( + GTK_ENTRY(entry_sphereRefinement_selectedCellSize), + help::scalarToText + ( + scalar(readScalar(dict.lookup("cellSize"))) + ).c_str() + ); + const vector centre(dict.lookup("centre")); + gtk_entry_set_text + ( + GTK_ENTRY(entry_sphereRefinement_selectedCentreX), + help::scalarToText(centre.x()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_sphereRefinement_selectedCentreY), + help::scalarToText(centre.y()).c_str() + ); + gtk_entry_set_text + ( + GTK_ENTRY(entry_sphereRefinement_selectedCentreZ), + help::scalarToText(centre.z()).c_str() + ); + + const scalar radius(readScalar(dict.lookup("radius"))); + gtk_entry_set_text + ( + GTK_ENTRY(entry_sphereRefinement_selectedRadius), + help::scalarToText(radius).c_str() + ); + + return; + } + + gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedCellSize), ""); + gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreX), ""); + gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreY), ""); + gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreZ), ""); + gtk_entry_set_text(GTK_ENTRY(entry_sphereRefinement_selectedRadius), ""); } static void resetValuesForSelectedLine ( - GtkWidget* widget, - GtkWidget* sphereRefinementFramePtr + GtkWidget* widget, + GtkWidget* sphereRefinementFramePtr ) { - GtkWidget* comboboxentry_sphereRefinement_createdSpheres = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "comboboxentry_sphereRefinement_createdSpheres" - ); - GtkWidget* entry_sphereRefinement_selectedCellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedCellSize" - ); - GtkWidget* entry_sphereRefinement_selectedCentreX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedCentreX" - ); - GtkWidget* entry_sphereRefinement_selectedCentreY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedCentreY" - ); - GtkWidget* entry_sphereRefinement_selectedCentreZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedCentreZ" - ); - GtkWidget* entry_sphereRefinement_selectedRadius = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_selectedRadius" - ); - - const word name = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO - ( - comboboxentry_sphereRefinement_createdSpheres - )->entry - ) - ); - - if( name == "" ) - return; - - const PtrList refs = guiPtr->objectRefinements(); - dictionary dict; - forAll(refs, refI) - if( refs[refI].keyword() == name ) - dict = refs[refI].dict(); - guiPtr->removeObjectRefinement(name); - if( widget == entry_sphereRefinement_selectedCellSize ) - { - const word size = - gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedCellSize)); - dict.remove("cellSize"); - dict.add("cellSize", help::textToScalar(size)); - } - else if( widget == entry_sphereRefinement_selectedCentreX ) - { - point centre(dict.lookup("centre")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreX)); - dict.remove("centre"); - centre.x() = help::textToScalar(c); - dict.add("centre", centre); - } - else if( widget == entry_sphereRefinement_selectedCentreY ) - { - point centre(dict.lookup("centre")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreY)); - dict.remove("centre"); - centre.y() = help::textToScalar(c); - dict.add("centre", centre); - } - else if( widget == entry_sphereRefinement_selectedCentreZ ) - { - point centre(dict.lookup("centre")); - const word c = - gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreZ)); - dict.remove("centre"); - centre.z() = help::textToScalar(c); - dict.add("centre", centre); - } - else if( widget == entry_sphereRefinement_selectedRadius ) - { - const word l = - gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedRadius)); - dict.remove("radius"); - scalar radius = help::textToScalar(l); - dict.add("radius", radius); - } - - sphereRefinement sr(name, dict); - guiPtr->addObjectRefinement(sr); + GtkWidget* comboboxentry_sphereRefinement_createdSpheres = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "comboboxentry_sphereRefinement_createdSpheres" + ); + GtkWidget* entry_sphereRefinement_selectedCellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedCellSize" + ); + GtkWidget* entry_sphereRefinement_selectedCentreX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedCentreX" + ); + GtkWidget* entry_sphereRefinement_selectedCentreY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedCentreY" + ); + GtkWidget* entry_sphereRefinement_selectedCentreZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedCentreZ" + ); + GtkWidget* entry_sphereRefinement_selectedRadius = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_selectedRadius" + ); + + const word name = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO + ( + comboboxentry_sphereRefinement_createdSpheres + )->entry + ) + ); + + if( name == "" ) + return; + + const PtrList refs = guiPtr->objectRefinements(); + dictionary dict; + forAll(refs, refI) + if( refs[refI].keyword() == name ) + dict = refs[refI].dict(); + guiPtr->removeObjectRefinement(name); + if( widget == entry_sphereRefinement_selectedCellSize ) + { + const word size = + gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedCellSize)); + dict.remove("cellSize"); + dict.add("cellSize", help::textToScalar(size)); + } + else if( widget == entry_sphereRefinement_selectedCentreX ) + { + point centre(dict.lookup("centre")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreX)); + dict.remove("centre"); + centre.x() = help::textToScalar(c); + dict.add("centre", centre); + } + else if( widget == entry_sphereRefinement_selectedCentreY ) + { + point centre(dict.lookup("centre")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreY)); + dict.remove("centre"); + centre.y() = help::textToScalar(c); + dict.add("centre", centre); + } + else if( widget == entry_sphereRefinement_selectedCentreZ ) + { + point centre(dict.lookup("centre")); + const word c = + gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedCentreZ)); + dict.remove("centre"); + centre.z() = help::textToScalar(c); + dict.add("centre", centre); + } + else if( widget == entry_sphereRefinement_selectedRadius ) + { + const word l = + gtk_entry_get_text(GTK_ENTRY(entry_sphereRefinement_selectedRadius)); + dict.remove("radius"); + scalar radius = help::textToScalar(l); + dict.add("radius", radius); + } + + sphereRefinement sr(name, dict); + guiPtr->addObjectRefinement(sr); } static void updateSphereRefinements(GtkWidget* sphereRefinementFramePtr) { - GtkWidget* comboboxentry_sphereRefinement_createdSpheres = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "comboboxentry_sphereRefinement_createdSpheres" - ); - - const PtrList refs = guiPtr->objectRefinements(); - label nSpheres(0); - GList* createdSpheres = 0; - forAll(refs, refI) - { - const word& key = refs[refI].keyword(); - const dictionary& dict = refs[refI].dict(); - const word type(dict.lookup("type")); - - if( type == "sphere" ) - { - ++nSpheres; - sphereRefinement sphere(key, dict); - createdSpheres = - g_list_append - ( - createdSpheres, - const_cast(sphere.name().c_str()) - ); - } - } - - gtk_combo_set_popdown_strings - ( - GTK_COMBO - ( - comboboxentry_sphereRefinement_createdSpheres - ), createdSpheres - ); - - if( nSpheres == 0 ) - { - gtk_entry_set_text - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_sphereRefinement_createdSpheres)->entry - ), - "" - ); - } - - g_list_free(createdSpheres); - - showDataForSphereRefinement(NULL, sphereRefinementFramePtr); + GtkWidget* comboboxentry_sphereRefinement_createdSpheres = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "comboboxentry_sphereRefinement_createdSpheres" + ); + + const PtrList refs = guiPtr->objectRefinements(); + label nSpheres(0); + GList* createdSpheres = 0; + forAll(refs, refI) + { + const word& key = refs[refI].keyword(); + const dictionary& dict = refs[refI].dict(); + const word type(dict.lookup("type")); + + if( type == "sphere" ) + { + ++nSpheres; + sphereRefinement sphere(key, dict); + createdSpheres = + g_list_append + ( + createdSpheres, + const_cast(sphere.name().c_str()) + ); + } + } + + gtk_combo_set_popdown_strings + ( + GTK_COMBO + ( + comboboxentry_sphereRefinement_createdSpheres + ), createdSpheres + ); + + if( nSpheres == 0 ) + { + gtk_entry_set_text + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_sphereRefinement_createdSpheres)->entry + ), + "" + ); + } + + g_list_free(createdSpheres); + + showDataForSphereRefinement(NULL, sphereRefinementFramePtr); } static void addSphereRefinement ( - GtkWidget* button, - GtkWidget* sphereRefinementFramePtr + GtkWidget* button, + GtkWidget* sphereRefinementFramePtr ) { - GtkWidget* name = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereName" - ); - GtkWidget* cellSize = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_cellSize" - ); - GtkWidget* centreX = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_centreX" - ); - GtkWidget* centreY = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_centreY" - ); - GtkWidget* centreZ = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_centreZ" - ); - GtkWidget* radius = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "entry_sphereRefinement_radius" - ); - - //- create all necessary settings - const word sphereName = gtk_entry_get_text(GTK_ENTRY(name)); - gtk_entry_set_text(GTK_ENTRY(name), ""); - const scalar sphereCellSize = - help::textToScalar(gtk_entry_get_text(GTK_ENTRY(cellSize))); - gtk_entry_set_text(GTK_ENTRY(cellSize), ""); - point centre, p1; - centre.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreX))); - gtk_entry_set_text(GTK_ENTRY(centreX), ""); - centre.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreY))); - gtk_entry_set_text(GTK_ENTRY(centreY), ""); - centre.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreZ))); - gtk_entry_set_text(GTK_ENTRY(centreZ), ""); - const scalar selectedRadius = - help::textToScalar(gtk_entry_get_text(GTK_ENTRY(radius))); - gtk_entry_set_text(GTK_ENTRY(radius), ""); - - sphereRefinement sphere - ( - sphereName, - sphereCellSize, - centre, - selectedRadius - ); - - guiPtr->addObjectRefinement(sphere); - - updateSphereRefinements(sphereRefinementFramePtr); + GtkWidget* name = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereName" + ); + GtkWidget* cellSize = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_cellSize" + ); + GtkWidget* centreX = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_centreX" + ); + GtkWidget* centreY = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_centreY" + ); + GtkWidget* centreZ = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_centreZ" + ); + GtkWidget* radius = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "entry_sphereRefinement_radius" + ); + + //- create all necessary settings + const word sphereName = gtk_entry_get_text(GTK_ENTRY(name)); + gtk_entry_set_text(GTK_ENTRY(name), ""); + const scalar sphereCellSize = + help::textToScalar(gtk_entry_get_text(GTK_ENTRY(cellSize))); + gtk_entry_set_text(GTK_ENTRY(cellSize), ""); + point centre, p1; + centre.x() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreX))); + gtk_entry_set_text(GTK_ENTRY(centreX), ""); + centre.y() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreY))); + gtk_entry_set_text(GTK_ENTRY(centreY), ""); + centre.z() = help::textToScalar(gtk_entry_get_text(GTK_ENTRY(centreZ))); + gtk_entry_set_text(GTK_ENTRY(centreZ), ""); + const scalar selectedRadius = + help::textToScalar(gtk_entry_get_text(GTK_ENTRY(radius))); + gtk_entry_set_text(GTK_ENTRY(radius), ""); + + sphereRefinement sphere + ( + sphereName, + sphereCellSize, + centre, + selectedRadius + ); + + guiPtr->addObjectRefinement(sphere); + + updateSphereRefinements(sphereRefinementFramePtr); } static void removeSphereRefinement ( - GtkWidget* button, - GtkWidget* sphereRefinementFramePtr + GtkWidget* button, + GtkWidget* sphereRefinementFramePtr ) { - GtkWidget* createdSpheres = - (GtkWidget*)g_object_get_data - ( - G_OBJECT(sphereRefinementFramePtr), - "comboboxentry_sphereRefinement_createdSpheres" - ); - - const word sphereName = - gtk_entry_get_text - ( - GTK_ENTRY - ( - GTK_COMBO(createdSpheres)->entry - ) - ); + GtkWidget* createdSpheres = + (GtkWidget*)g_object_get_data + ( + G_OBJECT(sphereRefinementFramePtr), + "comboboxentry_sphereRefinement_createdSpheres" + ); + + const word sphereName = + gtk_entry_get_text + ( + GTK_ENTRY + ( + GTK_COMBO(createdSpheres)->entry + ) + ); - guiPtr->removeObjectRefinement(sphereName); + guiPtr->removeObjectRefinement(sphereName); - updateSphereRefinements(sphereRefinementFramePtr); + updateSphereRefinements(sphereRefinementFramePtr); } } void meshGenGTK::createSphereRefinementWindowPage() { - guiPtr = &meshGui_; - - sphereRefinementFramePtr_ = gtk_frame_new(NULL); + guiPtr = &meshGui_; + + sphereRefinementFramePtr_ = gtk_frame_new(NULL); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a table - GtkWidget* table1 = gtk_table_new(5, 11, FALSE); - gtk_widget_show(table1); - gtk_container_add - ( - GTK_CONTAINER(sphereRefinementFramePtr_), - table1 - ); + //- create a table + GtkWidget* table1 = gtk_table_new(5, 11, FALSE); + gtk_widget_show(table1); + gtk_container_add + ( + GTK_CONTAINER(sphereRefinementFramePtr_), + table1 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for sphere name - GtkWidget* label_sphereName = gtk_label_new("Sphere name"); - gtk_widget_show(label_sphereName); - gtk_table_attach(GTK_TABLE(table1), label_sphereName, 0, 1, 0, 1, + //- create a label for sphere name + GtkWidget* label_sphereName = gtk_label_new("Sphere name"); + gtk_widget_show(label_sphereName); + gtk_table_attach(GTK_TABLE(table1), label_sphereName, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_sphereName), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_sphereName), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create an entry for box name - GtkWidget* entry_sphereName = gtk_entry_new(); - gtk_widget_show(entry_sphereName); - - gtk_table_attach(GTK_TABLE(table1), entry_sphereName, 1, 4, 0, 1, - (GtkAttachOptions)(GTK_FILL), + //- create an entry for box name + GtkWidget* entry_sphereName = gtk_entry_new(); + gtk_widget_show(entry_sphereName); + + gtk_table_attach(GTK_TABLE(table1), entry_sphereName, 1, 4, 0, 1, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for desired cell size - GtkWidget* label_sphereRefinement_cellSize = gtk_label_new("Cell size [m]"); - gtk_widget_show(label_sphereRefinement_cellSize); - gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_cellSize, - 0, 1, 1, 2, - (GtkAttachOptions)(GTK_FILL), + //- create a label for desired cell size + GtkWidget* label_sphereRefinement_cellSize = gtk_label_new("Cell size [m]"); + gtk_widget_show(label_sphereRefinement_cellSize); + gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_cellSize, + 0, 1, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_sphereRefinement_cellSize), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_sphereRefinement_cellSize), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for desired cell size - GtkWidget* entry_sphereRefinement_cellSize = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_cellSize); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_cellSize, - 1, 4, 1, 2, - (GtkAttachOptions)(GTK_FILL), + //- create a label for desired cell size + GtkWidget* entry_sphereRefinement_cellSize = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_cellSize); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_cellSize, + 1, 4, 1, 2, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create labels for axes - GtkWidget* label_axes = gtk_label_new("X"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 1, 2, 2, 3, - (GtkAttachOptions)(GTK_FILL), + //- create labels for axes + GtkWidget* label_axes = gtk_label_new("X"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 1, 2, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Y"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 2, 3, 2, 3, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Y"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 2, 3, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Z"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 3, 4, 2, 3, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Z"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 3, 4, 2, 3, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for centre - GtkWidget* label_sphereRefinement_centre = gtk_label_new("Centre"); - gtk_widget_show(label_sphereRefinement_centre); - gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_centre, - 0, 1, 3, 4, - (GtkAttachOptions)(GTK_FILL), + //- label for centre + GtkWidget* label_sphereRefinement_centre = gtk_label_new("Centre"); + gtk_widget_show(label_sphereRefinement_centre); + gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_centre, + 0, 1, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_sphereRefinement_centre), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_sphereRefinement_centre), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for centre - GtkWidget* entry_sphereRefinement_centreX = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_centreX); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_centreX, - 1, 2, 3, 4, - (GtkAttachOptions)(GTK_FILL), + //- entries for centre + GtkWidget* entry_sphereRefinement_centreX = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_centreX); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_centreX, + 1, 2, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_sphereRefinement_centreY = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_centreY); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_centreY, - 2, 3, 3, 4, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_sphereRefinement_centreY = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_centreY); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_centreY, + 2, 3, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_sphereRefinement_centreZ = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_centreZ); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_centreZ, - 3, 4, 3, 4, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_sphereRefinement_centreZ = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_centreZ); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_centreZ, + 3, 4, 3, 4, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for radius - GtkWidget* label_sphereRefinement_p1 = gtk_label_new("Radius [m]"); - gtk_widget_show(label_sphereRefinement_p1); - gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_p1, - 0, 1, 4, 5, - (GtkAttachOptions)(GTK_FILL), + //- label for radius + GtkWidget* label_sphereRefinement_p1 = gtk_label_new("Radius [m]"); + gtk_widget_show(label_sphereRefinement_p1); + gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_p1, + 0, 1, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_sphereRefinement_p1), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_sphereRefinement_p1), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entry for radius - GtkWidget* entry_sphereRefinement_radius = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_radius); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_radius, - 1, 4, 4, 5, - (GtkAttachOptions)(GTK_FILL), + //- entry for radius + GtkWidget* entry_sphereRefinement_radius = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_radius); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_radius, + 1, 4, 4, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for adding lines - GtkWidget* button1 = gtk_button_new(); - gtk_widget_show(button1); - gtk_table_attach - ( - GTK_TABLE(table1), - button1, - 4, 5, 0, 5, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - g_signal_connect - ( - G_OBJECT(button1), - "clicked", - G_CALLBACK(addSphereRefinement), - sphereRefinementFramePtr_ - ); + //- set the button for adding lines + GtkWidget* button1 = gtk_button_new(); + gtk_widget_show(button1); + gtk_table_attach + ( + GTK_TABLE(table1), + button1, + 4, 5, 0, 5, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + g_signal_connect + ( + G_OBJECT(button1), + "clicked", + G_CALLBACK(addSphereRefinement), + sphereRefinementFramePtr_ + ); - GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(button1), alignment1); - - GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox1); - gtk_container_add(GTK_CONTAINER(alignment1), hbox1); - - GtkWidget* image1 = - gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image1); - gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); - - GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); - gtk_widget_show(label3); - gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); - + GtkWidget* alignment1 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment1); + gtk_container_add(GTK_CONTAINER(button1), alignment1); + + GtkWidget* hbox1 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox1); + gtk_container_add(GTK_CONTAINER(alignment1), hbox1); + + GtkWidget* image1 = + gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image1); + gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0); + + GtkWidget* label3 = gtk_label_new_with_mnemonic("Add"); + gtk_widget_show(label3); + gtk_box_pack_start(GTK_BOX(hbox1), label3, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- horizontal separator - GtkWidget* hseparator0 = gtk_hseparator_new(); - gtk_widget_show(hseparator0); - gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 5, 6, + //- horizontal separator + GtkWidget* hseparator0 = gtk_hseparator_new(); + gtk_widget_show(hseparator0); + gtk_table_attach(GTK_TABLE(table1), hseparator0, 0, 5, 5, 6, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); + 0, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for existing line objects - GtkWidget* label_sphereRefinement_existing = - gtk_label_new("Existing spheres"); - gtk_widget_show(label_sphereRefinement_existing); - gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_existing, - 0, 1, 6, 7, - (GtkAttachOptions)(GTK_FILL), + //- label for existing line objects + GtkWidget* label_sphereRefinement_existing = + gtk_label_new("Existing spheres"); + gtk_widget_show(label_sphereRefinement_existing); + gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_existing, + 0, 1, 6, 7, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- combobox for existing box objects - GtkWidget* comboboxentry_sphereRefinement_createdSpheres = - gtk_combo_new(); - gtk_widget_show(comboboxentry_sphereRefinement_createdSpheres); - gtk_table_attach - ( - GTK_TABLE(table1),comboboxentry_sphereRefinement_createdSpheres, - 1, 2, 6, 7, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions)(0), 0, 0 - ); - - gtk_editable_set_editable - ( - GTK_EDITABLE - ( - GTK_COMBO(comboboxentry_sphereRefinement_createdSpheres)->entry - ), - 0 - ); - - + //- combobox for existing box objects + GtkWidget* comboboxentry_sphereRefinement_createdSpheres = + gtk_combo_new(); + gtk_widget_show(comboboxentry_sphereRefinement_createdSpheres); + gtk_table_attach + ( + GTK_TABLE(table1),comboboxentry_sphereRefinement_createdSpheres, + 1, 2, 6, 7, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0 + ); + + gtk_editable_set_editable + ( + GTK_EDITABLE + ( + GTK_COMBO(comboboxentry_sphereRefinement_createdSpheres)->entry + ), + 0 + ); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for selected cell size - GtkWidget* label_sphereRefinement_selectedCellSize = - gtk_label_new("Cell size [m]"); - gtk_widget_show(label_sphereRefinement_selectedCellSize); - gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_selectedCellSize, - 0, 1, 7, 8, - (GtkAttachOptions)(GTK_FILL), + //- create a label for selected cell size + GtkWidget* label_sphereRefinement_selectedCellSize = + gtk_label_new("Cell size [m]"); + gtk_widget_show(label_sphereRefinement_selectedCellSize); + gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_selectedCellSize, + 0, 1, 7, 8, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_sphereRefinement_selectedCellSize), 0, 0.5 - ); - + gtk_misc_set_alignment + ( + GTK_MISC(label_sphereRefinement_selectedCellSize), 0, 0.5 + ); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create a label for selected cell size - GtkWidget* entry_sphereRefinement_selectedCellSize = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_selectedCellSize); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedCellSize, - 1, 4, 7, 8, - (GtkAttachOptions)(GTK_FILL), + //- create a label for selected cell size + GtkWidget* entry_sphereRefinement_selectedCellSize = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_selectedCellSize); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedCellSize, + 1, 4, 7, 8, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- create labels for axes - label_axes = gtk_label_new("X"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 1, 2, 8, 9, - (GtkAttachOptions)(GTK_FILL), + //- create labels for axes + label_axes = gtk_label_new("X"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 1, 2, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Y"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 2, 3, 8, 9, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Y"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 2, 3, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - - label_axes = gtk_label_new("Z"); - gtk_widget_show(label_axes); - gtk_table_attach(GTK_TABLE(table1), label_axes, - 3, 4, 8, 9, - (GtkAttachOptions)(GTK_FILL), + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + + label_axes = gtk_label_new("Z"); + gtk_widget_show(label_axes); + gtk_table_attach(GTK_TABLE(table1), label_axes, + 3, 4, 8, 9, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); - + gtk_misc_set_alignment(GTK_MISC(label_axes), 0, 0.5); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for centre - GtkWidget* label_sphereRefinement_selectedCentre = - gtk_label_new("Centre"); - gtk_widget_show(label_sphereRefinement_selectedCentre); - gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_selectedCentre, - 0, 1, 9, 10, - (GtkAttachOptions)(GTK_FILL), + //- label for centre + GtkWidget* label_sphereRefinement_selectedCentre = + gtk_label_new("Centre"); + gtk_widget_show(label_sphereRefinement_selectedCentre); + gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_selectedCentre, + 0, 1, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_sphereRefinement_selectedCentre), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label_sphereRefinement_selectedCentre), 0, 0.5); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for selected centre - GtkWidget* entry_sphereRefinement_selectedCentreX = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_selectedCentreX); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedCentreX, - 1, 2, 9, 10, - (GtkAttachOptions)(GTK_FILL), + //- entries for selected centre + GtkWidget* entry_sphereRefinement_selectedCentreX = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_selectedCentreX); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedCentreX, + 1, 2, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_sphereRefinement_selectedCentreY = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_selectedCentreY); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedCentreY, - 2, 3, 9, 10, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_sphereRefinement_selectedCentreY = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_selectedCentreY); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedCentreY, + 2, 3, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - - GtkWidget* entry_sphereRefinement_selectedCentreZ = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_selectedCentreZ); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedCentreZ, - 3, 4, 9, 10, - (GtkAttachOptions)(GTK_FILL), + + GtkWidget* entry_sphereRefinement_selectedCentreZ = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_selectedCentreZ); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedCentreZ, + 3, 4, 9, 10, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- label for selected radius - GtkWidget* label_sphereRefinement_selectedRadius = - gtk_label_new("Radius [m]"); - gtk_widget_show(label_sphereRefinement_selectedRadius); - gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_selectedRadius, - 0, 1, 10, 11, - (GtkAttachOptions)(GTK_FILL), + //- label for selected radius + GtkWidget* label_sphereRefinement_selectedRadius = + gtk_label_new("Radius [m]"); + gtk_widget_show(label_sphereRefinement_selectedRadius); + gtk_table_attach(GTK_TABLE(table1), label_sphereRefinement_selectedRadius, + 0, 1, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - gtk_misc_set_alignment - ( - GTK_MISC(label_sphereRefinement_selectedRadius), 0, 0.5 - ); + gtk_misc_set_alignment + ( + GTK_MISC(label_sphereRefinement_selectedRadius), 0, 0.5 + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- entries for radius - GtkWidget* entry_sphereRefinement_selectedRadius = gtk_entry_new(); - gtk_widget_show(entry_sphereRefinement_selectedRadius); - gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedRadius, - 1, 4, 10, 11, - (GtkAttachOptions)(GTK_FILL), + //- entries for radius + GtkWidget* entry_sphereRefinement_selectedRadius = gtk_entry_new(); + gtk_widget_show(entry_sphereRefinement_selectedRadius); + gtk_table_attach(GTK_TABLE(table1), entry_sphereRefinement_selectedRadius, + 1, 4, 10, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - //- set the button for removing patches - GtkWidget* button2 = gtk_button_new(); - gtk_widget_show(button2); - gtk_table_attach - ( - GTK_TABLE(table1), - button2, - 4, 5, 6, 11, - (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 - ); - - g_signal_connect - ( - G_OBJECT(button2), - "clicked", - G_CALLBACK(removeSphereRefinement), - sphereRefinementFramePtr_ - ); - - GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); - gtk_widget_show(alignment2); - gtk_container_add(GTK_CONTAINER(button2), alignment2); - - GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); - gtk_widget_show(hbox2); - gtk_container_add(GTK_CONTAINER(alignment2), hbox2); - - GtkWidget* image2 = - gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); - gtk_widget_show(image2); - gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); - - GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); - gtk_widget_show(label5); - gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); - + //- set the button for removing patches + GtkWidget* button2 = gtk_button_new(); + gtk_widget_show(button2); + gtk_table_attach + ( + GTK_TABLE(table1), + button2, + 4, 5, 6, 11, + (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 5 + ); + + g_signal_connect + ( + G_OBJECT(button2), + "clicked", + G_CALLBACK(removeSphereRefinement), + sphereRefinementFramePtr_ + ); + + GtkWidget* alignment2 = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(alignment2); + gtk_container_add(GTK_CONTAINER(button2), alignment2); + + GtkWidget* hbox2 = gtk_hbox_new(FALSE, 2); + gtk_widget_show(hbox2); + gtk_container_add(GTK_CONTAINER(alignment2), hbox2); + + GtkWidget* image2 = + gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON); + gtk_widget_show(image2); + gtk_box_pack_start(GTK_BOX (hbox2), image2, FALSE, FALSE, 0); + + GtkWidget* label5 = gtk_label_new_with_mnemonic("Remove"); + gtk_widget_show(label5); + gtk_box_pack_start(GTK_BOX (hbox2), label5, FALSE, FALSE, 0); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF - ( - sphereRefinementFramePtr_, - sphereRefinementFramePtr_, - "sphereRefinementFramePtr_"); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - table1, - "table1" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereName, - "entry_sphereName" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_cellSize, - "entry_sphereRefinement_cellSize" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_centreX, - "entry_sphereRefinement_centreX" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_centreY, - "entry_sphereRefinement_centreY" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_centreZ, - "entry_sphereRefinement_centreZ" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_radius, - "entry_sphereRefinement_radius" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - comboboxentry_sphereRefinement_createdSpheres, - "comboboxentry_sphereRefinement_createdSpheres" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_selectedCellSize, - "entry_sphereRefinement_selectedCellSize" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_selectedCentreX, - "entry_sphereRefinement_selectedCentreX" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_selectedCentreY, - "entry_sphereRefinement_selectedCentreY" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_selectedCentreZ, - "entry_sphereRefinement_selectedCentreZ" - ); - GLADE_HOOKUP_OBJECT - ( - sphereRefinementFramePtr_, - entry_sphereRefinement_selectedRadius, - "entry_sphereRefinement_selectedRadius" - ); - - updateSphereRefinements(sphereRefinementFramePtr_); - - g_signal_connect - ( - G_OBJECT - ( - GTK_ENTRY - ( - GTK_COMBO(comboboxentry_sphereRefinement_createdSpheres)->entry - ) - ), - "changed", - G_CALLBACK(showDataForSphereRefinement), - sphereRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_sphereRefinement_selectedCellSize), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - sphereRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_sphereRefinement_selectedCentreX), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - sphereRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_sphereRefinement_selectedCentreY), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - sphereRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_sphereRefinement_selectedCentreZ), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - sphereRefinementFramePtr_ - ); - - g_signal_connect - ( - G_OBJECT(entry_sphereRefinement_selectedRadius), - "changed", - G_CALLBACK(resetValuesForSelectedLine), - sphereRefinementFramePtr_ - ); - - gtk_widget_show(sphereRefinementFramePtr_); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF + ( + sphereRefinementFramePtr_, + sphereRefinementFramePtr_, + "sphereRefinementFramePtr_"); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + table1, + "table1" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereName, + "entry_sphereName" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_cellSize, + "entry_sphereRefinement_cellSize" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_centreX, + "entry_sphereRefinement_centreX" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_centreY, + "entry_sphereRefinement_centreY" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_centreZ, + "entry_sphereRefinement_centreZ" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_radius, + "entry_sphereRefinement_radius" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + comboboxentry_sphereRefinement_createdSpheres, + "comboboxentry_sphereRefinement_createdSpheres" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_selectedCellSize, + "entry_sphereRefinement_selectedCellSize" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_selectedCentreX, + "entry_sphereRefinement_selectedCentreX" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_selectedCentreY, + "entry_sphereRefinement_selectedCentreY" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_selectedCentreZ, + "entry_sphereRefinement_selectedCentreZ" + ); + GLADE_HOOKUP_OBJECT + ( + sphereRefinementFramePtr_, + entry_sphereRefinement_selectedRadius, + "entry_sphereRefinement_selectedRadius" + ); + + updateSphereRefinements(sphereRefinementFramePtr_); + + g_signal_connect + ( + G_OBJECT + ( + GTK_ENTRY + ( + GTK_COMBO(comboboxentry_sphereRefinement_createdSpheres)->entry + ) + ), + "changed", + G_CALLBACK(showDataForSphereRefinement), + sphereRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_sphereRefinement_selectedCellSize), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + sphereRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_sphereRefinement_selectedCentreX), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + sphereRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_sphereRefinement_selectedCentreY), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + sphereRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_sphereRefinement_selectedCentreZ), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + sphereRefinementFramePtr_ + ); + + g_signal_connect + ( + G_OBJECT(entry_sphereRefinement_selectedRadius), + "changed", + G_CALLBACK(resetValuesForSelectedLine), + sphereRefinementFramePtr_ + ); + + gtk_widget_show(sphereRefinementFramePtr_); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGUI/meshGenGUI.C b/GUI/meshGenGUI/meshGenGUI.C index ec4a697..4530ed2 100644 --- a/GUI/meshGenGUI/meshGenGUI.C +++ b/GUI/meshGenGUI/meshGenGUI.C @@ -40,15 +40,15 @@ namespace Foam void meshGenGUI::createSurface(const fileName& name) const { - surfacePtr_ = new triSurface(name); + surfacePtr_ = new triSurface(name); } const triSurface& meshGenGUI::surface() const { - if( !surfacePtr_ ) - createSurface(surfaceFileName()); - - return *surfacePtr_; + if( !surfacePtr_ ) + createSurface(surfaceFileName()); + + return *surfacePtr_; } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -59,9 +59,9 @@ meshGenGUI::meshGenGUI const objectRegistry& reg ) : - meshDict_ - ( - IOobject + meshDict_ + ( + IOobject ( "meshDict", reg.time().system(), @@ -70,9 +70,9 @@ meshGenGUI::meshGenGUI IOobject::AUTO_WRITE ) ), - surfacePtr_(NULL) + surfacePtr_(NULL) { - Info << meshDict_ << endl; + Info << meshDict_ << endl; } // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGUI/meshGenGUI.H b/GUI/meshGenGUI/meshGenGUI.H index 4c6e8b1..7d4b100 100644 --- a/GUI/meshGenGUI/meshGenGUI.H +++ b/GUI/meshGenGUI/meshGenGUI.H @@ -45,7 +45,7 @@ SourceFiles namespace Foam { - + class triSurface; /*---------------------------------------------------------------------------*\ @@ -58,13 +58,13 @@ class meshGenGUI //- IOdictionary containing information about cell sizes, etc.. IOdictionary meshDict_; - - //- pointer to the triangulated surface - mutable triSurface* surfacePtr_; - - // Private member functions - //- create surface from fileName - void createSurface(const fileName&) const; + + //- pointer to the triangulated surface + mutable triSurface* surfacePtr_; + + // Private member functions + //- create surface from fileName + void createSurface(const fileName&) const; //- Disallow default bitwise copy construct meshGenGUI(const meshGenGUI&); @@ -85,100 +85,100 @@ public: // Member Functions - //- return surface - const triSurface& surface() const; - - // General meshDict settings - - //- set and get surface file name - void setSurfaceFileName(const fileName&); - fileName surfaceFileName() const; - - //- set and get max cell size - void setMaxCellSize(const scalar s); - scalar maxCellSize() const; - - //- set and get boundary cell size - bool boundaryCellSizeEntryExist() const; - void removeBoundaryCellSize(); - void setBoundaryCellSize(const scalar s); - scalar boundaryCellSize() const; - - //- set and get cell size for automatic refinement - bool minCellSizeEntryExist() const; - void removeMinCellSize(); - void setMinCellSize(const scalar s); - scalar minCellSize() const; - - //- set and get if boundary cells should be used - bool keepCellsIntersectingBoundaryEntryExist() const; - void setKeepCellsIntersectingBoundary(); - void removeKeepCellsIntersectingBoundary(); - bool keepCellsIntersectingBoundary() const; - - //- set and get the check for glued mesh should be used - bool checkForGluedMeshEntryExist() const; - void setCheckForGluedMesh(); - void removeCheckForGluedMesh(); - bool checkForGluedMesh() const; - - // Settings for patch-wise refinement - //- set and get patch refinement - bool patchCellSizeEntryExist() const; - void addPatchCellSize(const patchRefinement&); - void removePatchCellSize(const word&); - List patchCellSize() const; - - // Settings for keep cells intersecting patches - //- set end get keep cells intersecting patches - bool keepCellsIntersectingPatchesEntryExist() const; - void addKeepCellsIntersectingPatches(const word&); - void removeKeepCellsIntersectingPatches(const word&); - wordList keepCellsIntersectingPatches() const; - - // Settings for patch-wise boundary layers - //- set and get patches for which the layers should be created - bool bndLayersEntryExist() const; - void addBndLayersPatches(const word&); - void removeBndLayersPatches(const word&); - wordList keepBndLayersPatches() const; - - // Settings for subset-wise refinement - //- set and get functions for face-subset refinement - void setSubsetFileName(const fileName&); - fileName subsetFileName() const; - bool subsetCellSizeEntryExist() const; - void addSubsetCellSize(const patchRefinement&); - void removeSubsetCellSize(const word&); - List subsetCellSize() const; - - // object refinement - //- general object refinement stuff - bool objectRefinementEntryExist() const; - PtrList objectRefinements() const; - void addObjectRefinement(const objectRefinement&); - void removeObjectRefinement(const word& name); - - // rename boundaries - bool renameBoundaryEntryExist() const; - bool defaultPatchNameEntryExist() const; - word defaultPatchName() const; - void setDefaultPatchName(const word&); - void removeDefaultPatchName(); - bool defaultPatchTypeEntryExist() const; - word defaultPatchType() const; - void setDefaultPatchType(const word&); - void removeDefaultPatchType(); - bool newPatchNamesEntryExist() const; - PtrList newPatchNames() const; - void addNewPatchName(const word&, const dictionary&); - void removePatchName(const word&); - - // write the dictionary + //- return surface + const triSurface& surface() const; + + // General meshDict settings + + //- set and get surface file name + void setSurfaceFileName(const fileName&); + fileName surfaceFileName() const; + + //- set and get max cell size + void setMaxCellSize(const scalar s); + scalar maxCellSize() const; + + //- set and get boundary cell size + bool boundaryCellSizeEntryExist() const; + void removeBoundaryCellSize(); + void setBoundaryCellSize(const scalar s); + scalar boundaryCellSize() const; + + //- set and get cell size for automatic refinement + bool minCellSizeEntryExist() const; + void removeMinCellSize(); + void setMinCellSize(const scalar s); + scalar minCellSize() const; + + //- set and get if boundary cells should be used + bool keepCellsIntersectingBoundaryEntryExist() const; + void setKeepCellsIntersectingBoundary(); + void removeKeepCellsIntersectingBoundary(); + bool keepCellsIntersectingBoundary() const; + + //- set and get the check for glued mesh should be used + bool checkForGluedMeshEntryExist() const; + void setCheckForGluedMesh(); + void removeCheckForGluedMesh(); + bool checkForGluedMesh() const; + + // Settings for patch-wise refinement + //- set and get patch refinement + bool patchCellSizeEntryExist() const; + void addPatchCellSize(const patchRefinement&); + void removePatchCellSize(const word&); + List patchCellSize() const; + + // Settings for keep cells intersecting patches + //- set end get keep cells intersecting patches + bool keepCellsIntersectingPatchesEntryExist() const; + void addKeepCellsIntersectingPatches(const word&); + void removeKeepCellsIntersectingPatches(const word&); + wordList keepCellsIntersectingPatches() const; + + // Settings for patch-wise boundary layers + //- set and get patches for which the layers should be created + bool bndLayersEntryExist() const; + void addBndLayersPatches(const word&); + void removeBndLayersPatches(const word&); + wordList keepBndLayersPatches() const; + + // Settings for subset-wise refinement + //- set and get functions for face-subset refinement + void setSubsetFileName(const fileName&); + fileName subsetFileName() const; + bool subsetCellSizeEntryExist() const; + void addSubsetCellSize(const patchRefinement&); + void removeSubsetCellSize(const word&); + List subsetCellSize() const; + + // object refinement + //- general object refinement stuff + bool objectRefinementEntryExist() const; + PtrList objectRefinements() const; + void addObjectRefinement(const objectRefinement&); + void removeObjectRefinement(const word& name); + + // rename boundaries + bool renameBoundaryEntryExist() const; + bool defaultPatchNameEntryExist() const; + word defaultPatchName() const; + void setDefaultPatchName(const word&); + void removeDefaultPatchName(); + bool defaultPatchTypeEntryExist() const; + word defaultPatchType() const; + void setDefaultPatchType(const word&); + void removeDefaultPatchType(); + bool newPatchNamesEntryExist() const; + PtrList newPatchNames() const; + void addNewPatchName(const word&, const dictionary&); + void removePatchName(const word&); + + // write the dictionary void writeDict() const - { - meshDict_.regIOobject::write(); - } + { + meshDict_.regIOobject::write(); + } }; diff --git a/GUI/meshGenGUI/meshGenGUIBndLayers.C b/GUI/meshGenGUI/meshGenGUIBndLayers.C index 01f407e..1ebb03a 100644 --- a/GUI/meshGenGUI/meshGenGUIBndLayers.C +++ b/GUI/meshGenGUI/meshGenGUIBndLayers.C @@ -37,62 +37,62 @@ namespace Foam bool meshGenGUI::bndLayersEntryExist() const { - return meshDict_.found("boundaryLayers"); + return meshDict_.found("boundaryLayers"); } void meshGenGUI::addBndLayersPatches(const word& pName) { - if( bndLayersEntryExist() ) - { - wordList pList(meshDict_.lookup("boundaryLayers")); - - const label size = pList.size(); - pList.setSize(size + 1); - pList[size] = pName; - - meshDict_.remove("boundaryLayers"); - meshDict_.add("boundaryLayers", pList); - } - else - { - wordList pList(1); - pList[0] = pName; - - meshDict_.add("boundaryLayers", pList); - } + if( bndLayersEntryExist() ) + { + wordList pList(meshDict_.lookup("boundaryLayers")); + + const label size = pList.size(); + pList.setSize(size + 1); + pList[size] = pName; + + meshDict_.remove("boundaryLayers"); + meshDict_.add("boundaryLayers", pList); + } + else + { + wordList pList(1); + pList[0] = pName; + + meshDict_.add("boundaryLayers", pList); + } } void meshGenGUI::removeBndLayersPatches(const word& pName) { - if( bndLayersEntryExist() ) - { - wordList pList(meshDict_.lookup("boundaryLayers")); - - label pos(-1); - forAll(pList, elI) - if( pList[elI] == pName ) - { - pos = elI; - break; - } - - pList[pos] = pList[pList.size() - 1]; - pList.setSize(pList.size() - 1); - - meshDict_.remove("boundaryLayers"); - - if( pList.size() != 0 ) - meshDict_.add("boundaryLayers", pList); - } + if( bndLayersEntryExist() ) + { + wordList pList(meshDict_.lookup("boundaryLayers")); + + label pos(-1); + forAll(pList, elI) + if( pList[elI] == pName ) + { + pos = elI; + break; + } + + pList[pos] = pList[pList.size() - 1]; + pList.setSize(pList.size() - 1); + + meshDict_.remove("boundaryLayers"); + + if( pList.size() != 0 ) + meshDict_.add("boundaryLayers", pList); + } } wordList meshGenGUI::keepBndLayersPatches() const { - if( !bndLayersEntryExist() ) - return wordList(); - - wordList pNames(meshDict_.lookup("boundaryLayers")); - return pNames; + if( !bndLayersEntryExist() ) + return wordList(); + + wordList pNames(meshDict_.lookup("boundaryLayers")); + return pNames; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGUI/meshGenGUIGeneral.C b/GUI/meshGenGUI/meshGenGUIGeneral.C index 2f7f517..b35bf01 100644 --- a/GUI/meshGenGUI/meshGenGUIGeneral.C +++ b/GUI/meshGenGUI/meshGenGUIGeneral.C @@ -37,136 +37,136 @@ namespace Foam void meshGenGUI::setSurfaceFileName(const fileName& fName) { - if( meshDict_.found("surfaceFile") ) - meshDict_.remove("surfaceFile"); - - meshDict_.add("surfaceFile", fName); + if( meshDict_.found("surfaceFile") ) + meshDict_.remove("surfaceFile"); + + meshDict_.add("surfaceFile", fName); } fileName meshGenGUI::surfaceFileName() const { - if( !meshDict_.found("surfaceFile") ) - { - fileName f(""); - const_cast(meshDict_).add("surfaceFile", f); - } - - return meshDict_.lookup("surfaceFile"); + if( !meshDict_.found("surfaceFile") ) + { + fileName f(""); + const_cast(meshDict_).add("surfaceFile", f); + } + + return meshDict_.lookup("surfaceFile"); } void meshGenGUI::setMaxCellSize(const scalar s) { - if( meshDict_.found("maxCellSize") ) - meshDict_.remove("maxCellSize"); - - meshDict_.add("maxCellSize", s); + if( meshDict_.found("maxCellSize") ) + meshDict_.remove("maxCellSize"); + + meshDict_.add("maxCellSize", s); } scalar meshGenGUI::maxCellSize() const { - if( !meshDict_.found("maxCellSize") ) - const_cast(meshDict_).add("maxCellSize", 1.0); - - return readScalar(meshDict_.lookup("maxCellSize")); + if( !meshDict_.found("maxCellSize") ) + const_cast(meshDict_).add("maxCellSize", 1.0); + + return readScalar(meshDict_.lookup("maxCellSize")); } - + bool meshGenGUI::boundaryCellSizeEntryExist() const { - word w("boundaryCellSize"); - return meshDict_.found(w); + word w("boundaryCellSize"); + return meshDict_.found(w); } void meshGenGUI::removeBoundaryCellSize() { - meshDict_.remove("boundaryCellSize"); + meshDict_.remove("boundaryCellSize"); } void meshGenGUI::setBoundaryCellSize(const scalar s) { - if( boundaryCellSizeEntryExist() ) - meshDict_.remove("boundaryCellSize"); - - meshDict_.add("boundaryCellSize", s); + if( boundaryCellSizeEntryExist() ) + meshDict_.remove("boundaryCellSize"); + + meshDict_.add("boundaryCellSize", s); } scalar meshGenGUI::boundaryCellSize() const { - return readScalar(meshDict_.lookup("boundaryCellSize")); + return readScalar(meshDict_.lookup("boundaryCellSize")); } - + bool meshGenGUI::minCellSizeEntryExist() const { - return meshDict_.found("minCellSize"); + return meshDict_.found("minCellSize"); } void meshGenGUI::removeMinCellSize() { - if( minCellSizeEntryExist() ) - meshDict_.remove("minCellSize"); + if( minCellSizeEntryExist() ) + meshDict_.remove("minCellSize"); } void meshGenGUI::setMinCellSize(const scalar s) { - removeMinCellSize(); - - meshDict_.add("minCellSize", s); + removeMinCellSize(); + + meshDict_.add("minCellSize", s); } scalar meshGenGUI::minCellSize() const { - return readScalar(meshDict_.lookup("minCellSize")); + return readScalar(meshDict_.lookup("minCellSize")); } - + bool meshGenGUI::keepCellsIntersectingBoundaryEntryExist() const { - return meshDict_.found("keepCellsIntersectingBoundary"); + return meshDict_.found("keepCellsIntersectingBoundary"); } void meshGenGUI::setKeepCellsIntersectingBoundary() { - removeKeepCellsIntersectingBoundary(); - - meshDict_.add("keepCellsIntersectingBoundary", 1); + removeKeepCellsIntersectingBoundary(); + + meshDict_.add("keepCellsIntersectingBoundary", 1); } void meshGenGUI::removeKeepCellsIntersectingBoundary() { - if( keepCellsIntersectingBoundaryEntryExist() ) - meshDict_.remove("keepCellsIntersectingBoundary"); + if( keepCellsIntersectingBoundaryEntryExist() ) + meshDict_.remove("keepCellsIntersectingBoundary"); } bool meshGenGUI::keepCellsIntersectingBoundary() const { - if( !keepCellsIntersectingBoundaryEntryExist() ) - return false; - - return meshDict_.lookup("keepCellsIntersectingBoundary"); + if( !keepCellsIntersectingBoundaryEntryExist() ) + return false; + + return meshDict_.lookup("keepCellsIntersectingBoundary"); } - + bool meshGenGUI::checkForGluedMeshEntryExist() const { - return meshDict_.found("checkForGluedMesh"); + return meshDict_.found("checkForGluedMesh"); } void meshGenGUI::setCheckForGluedMesh() { - removeCheckForGluedMesh(); - - meshDict_.add("checkForGluedMesh", 1); + removeCheckForGluedMesh(); + + meshDict_.add("checkForGluedMesh", 1); } void meshGenGUI::removeCheckForGluedMesh() { - if( checkForGluedMeshEntryExist() ) - meshDict_.remove("checkForGluedMesh"); + if( checkForGluedMeshEntryExist() ) + meshDict_.remove("checkForGluedMesh"); } bool meshGenGUI::checkForGluedMesh() const { - if( !checkForGluedMeshEntryExist() ) - return false; - - return readBool(meshDict_.lookup("checkForGluedMesh")); + if( !checkForGluedMeshEntryExist() ) + return false; + + return readBool(meshDict_.lookup("checkForGluedMesh")); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGUI/meshGenGUIKeepCellsIntersectingPatches.C b/GUI/meshGenGUI/meshGenGUIKeepCellsIntersectingPatches.C index 881a125..6379bf7 100644 --- a/GUI/meshGenGUI/meshGenGUIKeepCellsIntersectingPatches.C +++ b/GUI/meshGenGUI/meshGenGUIKeepCellsIntersectingPatches.C @@ -37,62 +37,62 @@ namespace Foam bool meshGenGUI::keepCellsIntersectingPatchesEntryExist() const { - return meshDict_.found("keepCellsIntersectingPatches"); + return meshDict_.found("keepCellsIntersectingPatches"); } void meshGenGUI::addKeepCellsIntersectingPatches(const word& pName) { - if( keepCellsIntersectingPatchesEntryExist() ) - { - wordList pList(meshDict_.lookup("keepCellsIntersectingPatches")); - - const label size = pList.size(); - pList.setSize(size + 1); - pList[size] = pName; - - meshDict_.remove("keepCellsIntersectingPatches"); - meshDict_.add("keepCellsIntersectingPatches", pList); - } - else - { - wordList pList(1); - pList[0] = pName; - - meshDict_.add("keepCellsIntersectingPatches", pList); - } + if( keepCellsIntersectingPatchesEntryExist() ) + { + wordList pList(meshDict_.lookup("keepCellsIntersectingPatches")); + + const label size = pList.size(); + pList.setSize(size + 1); + pList[size] = pName; + + meshDict_.remove("keepCellsIntersectingPatches"); + meshDict_.add("keepCellsIntersectingPatches", pList); + } + else + { + wordList pList(1); + pList[0] = pName; + + meshDict_.add("keepCellsIntersectingPatches", pList); + } } void meshGenGUI::removeKeepCellsIntersectingPatches(const word& pName) { - if( keepCellsIntersectingPatchesEntryExist() ) - { - wordList pList(meshDict_.lookup("keepCellsIntersectingPatches")); - - label pos(-1); - forAll(pList, elI) - if( pList[elI] == pName ) - { - pos = elI; - break; - } - - pList[pos] = pList[pList.size() - 1]; - pList.setSize(pList.size() - 1); - - meshDict_.remove("keepCellsIntersectingPatches"); - - if( pList.size() != 0 ) - meshDict_.add("keepCellsIntersectingPatches", pList); - } + if( keepCellsIntersectingPatchesEntryExist() ) + { + wordList pList(meshDict_.lookup("keepCellsIntersectingPatches")); + + label pos(-1); + forAll(pList, elI) + if( pList[elI] == pName ) + { + pos = elI; + break; + } + + pList[pos] = pList[pList.size() - 1]; + pList.setSize(pList.size() - 1); + + meshDict_.remove("keepCellsIntersectingPatches"); + + if( pList.size() != 0 ) + meshDict_.add("keepCellsIntersectingPatches", pList); + } } wordList meshGenGUI::keepCellsIntersectingPatches() const { - if( !keepCellsIntersectingPatchesEntryExist() ) - return wordList(); - - wordList pNames(meshDict_.lookup("keepCellsIntersectingPatches")); - return pNames; + if( !keepCellsIntersectingPatchesEntryExist() ) + return wordList(); + + wordList pNames(meshDict_.lookup("keepCellsIntersectingPatches")); + return pNames; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGUI/meshGenGUIObjectRefinement.C b/GUI/meshGenGUI/meshGenGUIObjectRefinement.C index 1815faa..7c8fa60 100644 --- a/GUI/meshGenGUI/meshGenGUIObjectRefinement.C +++ b/GUI/meshGenGUI/meshGenGUIObjectRefinement.C @@ -35,89 +35,89 @@ namespace Foam { // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - + bool meshGenGUI::objectRefinementEntryExist() const { - return meshDict_.found("objectRefinements"); + return meshDict_.found("objectRefinements"); } PtrList meshGenGUI::objectRefinements() const { - if( !objectRefinementEntryExist() ) - { - return PtrList(); - } - - // Read polyPatchList - Istream& is = meshDict_.lookup("objectRefinements"); - - PtrList objectEntries(is); + if( !objectRefinementEntryExist() ) + { + return PtrList(); + } + + // Read polyPatchList + Istream& is = meshDict_.lookup("objectRefinements"); + + PtrList objectEntries(is); return objectEntries; } void meshGenGUI::addObjectRefinement(const objectRefinement& object) { - if( objectRefinementEntryExist() ) - { - PtrList objectEntries(meshDict_.lookup("objectRefinements")); - const label s = objectEntries.size(); - - objectEntries.setSize(s+1); - objectEntries.set - ( - s, - new dictionaryEntry(object.name(), object.dict()) - ); - - meshDict_.remove("objectRefinements"); - meshDict_.add("objectRefinements", objectEntries); - } - else - { - PtrList objectEntries(1); - objectEntries.set - ( - 0, - new dictionaryEntry - ( - object.name(), - object.dict() - ) - ); - - meshDict_.add("objectRefinements", objectEntries); - } + if( objectRefinementEntryExist() ) + { + PtrList objectEntries(meshDict_.lookup("objectRefinements")); + const label s = objectEntries.size(); + + objectEntries.setSize(s+1); + objectEntries.set + ( + s, + new dictionaryEntry(object.name(), object.dict()) + ); + + meshDict_.remove("objectRefinements"); + meshDict_.add("objectRefinements", objectEntries); + } + else + { + PtrList objectEntries(1); + objectEntries.set + ( + 0, + new dictionaryEntry + ( + object.name(), + object.dict() + ) + ); + + meshDict_.add("objectRefinements", objectEntries); + } } void meshGenGUI::removeObjectRefinement(const word& name) { - if( !objectRefinementEntryExist() ) - return; - - PtrList objectEntries(meshDict_.lookup("objectRefinements")); - meshDict_.remove("objectRefinements"); - - if( objectEntries.size() == 1 ) - return; - - PtrList refs(objectEntries.size()-1); - label counter(0); - forAll(objectEntries, i) - if( objectEntries[i].keyword() != name ) - { - refs.set - ( - counter++, - new dictionaryEntry - ( - objectEntries[i].keyword(), - objectEntries[i].dict() - ) - ); - } - - meshDict_.add("objectRefinements", refs); + if( !objectRefinementEntryExist() ) + return; + + PtrList objectEntries(meshDict_.lookup("objectRefinements")); + meshDict_.remove("objectRefinements"); + + if( objectEntries.size() == 1 ) + return; + + PtrList refs(objectEntries.size()-1); + label counter(0); + forAll(objectEntries, i) + if( objectEntries[i].keyword() != name ) + { + refs.set + ( + counter++, + new dictionaryEntry + ( + objectEntries[i].keyword(), + objectEntries[i].dict() + ) + ); + } + + meshDict_.add("objectRefinements", refs); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGUI/meshGenGUIPatchRefinement.C b/GUI/meshGenGUI/meshGenGUIPatchRefinement.C index 24a51cb..a4e52bc 100644 --- a/GUI/meshGenGUI/meshGenGUIPatchRefinement.C +++ b/GUI/meshGenGUI/meshGenGUIPatchRefinement.C @@ -37,60 +37,60 @@ namespace Foam bool meshGenGUI::patchCellSizeEntryExist() const { - return meshDict_.found("patchCellSize"); + return meshDict_.found("patchCellSize"); } void meshGenGUI::addPatchCellSize(const patchRefinement& pr) { - if( patchCellSizeEntryExist() ) - { - List prList(meshDict_.lookup("patchCellSize")); - - const label size = prList.size(); - prList.setSize(size + 1); - prList[size] = pr; - - meshDict_.remove("patchCellSize"); - meshDict_.add("patchCellSize", prList); - } - else - { - List prList(1); - prList[0] = pr; - - meshDict_.add("patchCellSize", prList); - } + if( patchCellSizeEntryExist() ) + { + List prList(meshDict_.lookup("patchCellSize")); + + const label size = prList.size(); + prList.setSize(size + 1); + prList[size] = pr; + + meshDict_.remove("patchCellSize"); + meshDict_.add("patchCellSize", prList); + } + else + { + List prList(1); + prList[0] = pr; + + meshDict_.add("patchCellSize", prList); + } } void meshGenGUI::removePatchCellSize(const word& patchName) { - if( patchCellSizeEntryExist() ) - { - List prList(meshDict_.lookup("patchCellSize")); - - label pos(-1); - forAll(prList, elI) - if( prList[elI].patchName() == patchName ) - { - pos = elI; - break; - } - - prList[pos] = prList[prList.size() - 1]; - prList.setSize(prList.size() - 1); - - meshDict_.remove("patchCellSize"); - meshDict_.add("patchCellSize", prList); - } + if( patchCellSizeEntryExist() ) + { + List prList(meshDict_.lookup("patchCellSize")); + + label pos(-1); + forAll(prList, elI) + if( prList[elI].patchName() == patchName ) + { + pos = elI; + break; + } + + prList[pos] = prList[prList.size() - 1]; + prList.setSize(prList.size() - 1); + + meshDict_.remove("patchCellSize"); + meshDict_.add("patchCellSize", prList); + } } List meshGenGUI::patchCellSize() const { - if( !patchCellSizeEntryExist() ) - return List(); - - List pr(meshDict_.lookup("patchCellSize")); - return pr; + if( !patchCellSizeEntryExist() ) + return List(); + + List pr(meshDict_.lookup("patchCellSize")); + return pr; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenGUI/meshGenGUIRenameBoundary.C b/GUI/meshGenGUI/meshGenGUIRenameBoundary.C index 0e76c61..572e95d 100644 --- a/GUI/meshGenGUI/meshGenGUIRenameBoundary.C +++ b/GUI/meshGenGUI/meshGenGUIRenameBoundary.C @@ -38,228 +38,228 @@ namespace Foam bool meshGenGUI::renameBoundaryEntryExist() const { - if( meshDict_.found("renameBoundary") ) - return true; - - return false; + if( meshDict_.found("renameBoundary") ) + return true; + + return false; } bool meshGenGUI::defaultPatchNameEntryExist() const { - if( renameBoundaryEntryExist() ) - { - const dictionary& dict = meshDict_.subDict("renameBoundary"); - - if( dict.found("defaultName") ) - return true; - } - - return false; + if( renameBoundaryEntryExist() ) + { + const dictionary& dict = meshDict_.subDict("renameBoundary"); + + if( dict.found("defaultName") ) + return true; + } + + return false; } word meshGenGUI::defaultPatchName() const { - if( defaultPatchNameEntryExist() ) - { - const dictionary& dict = meshDict_.subDict("renameBoundary"); - const word name(dict.lookup("defaultName")); - return name; - } - - return word(); + if( defaultPatchNameEntryExist() ) + { + const dictionary& dict = meshDict_.subDict("renameBoundary"); + const word name(dict.lookup("defaultName")); + return name; + } + + return word(); } void meshGenGUI::setDefaultPatchName(const word& name) { - if( renameBoundaryEntryExist() ) - { - dictionary dict = meshDict_.subDict("renameBoundary"); - meshDict_.remove("renameBoundary"); - - if( dict.found("defaultName") ) - dict.remove("defaultName"); - - dict.add("defaultName", name); - meshDict_.add("renameBoundary", dict); - } - else - { - dictionary dict; - dict.add("defaultName", name); - meshDict_.add("renameBoundary", dict); - } + if( renameBoundaryEntryExist() ) + { + dictionary dict = meshDict_.subDict("renameBoundary"); + meshDict_.remove("renameBoundary"); + + if( dict.found("defaultName") ) + dict.remove("defaultName"); + + dict.add("defaultName", name); + meshDict_.add("renameBoundary", dict); + } + else + { + dictionary dict; + dict.add("defaultName", name); + meshDict_.add("renameBoundary", dict); + } } void meshGenGUI::removeDefaultPatchName() { - if( renameBoundaryEntryExist() ) - { - dictionary dict = meshDict_.subDict("renameBoundary"); - meshDict_.remove("renameBoundary"); - - dict.remove("defaultName"); - - if( dict.toc().size() != 0 ) - meshDict_.add("renameBoundary", dict); - } + if( renameBoundaryEntryExist() ) + { + dictionary dict = meshDict_.subDict("renameBoundary"); + meshDict_.remove("renameBoundary"); + + dict.remove("defaultName"); + + if( dict.toc().size() != 0 ) + meshDict_.add("renameBoundary", dict); + } } bool meshGenGUI::defaultPatchTypeEntryExist() const { - if( renameBoundaryEntryExist() ) - { - const dictionary& dict = meshDict_.subDict("renameBoundary"); - - if( dict.found("defaultType") ) - return true; - } - - return false; + if( renameBoundaryEntryExist() ) + { + const dictionary& dict = meshDict_.subDict("renameBoundary"); + + if( dict.found("defaultType") ) + return true; + } + + return false; } word meshGenGUI::defaultPatchType() const { - if( defaultPatchNameEntryExist() ) - { - const dictionary& dict = meshDict_.subDict("renameBoundary"); - const word type(dict.lookup("defaultType")); - return type; - } - - return word(); + if( defaultPatchNameEntryExist() ) + { + const dictionary& dict = meshDict_.subDict("renameBoundary"); + const word type(dict.lookup("defaultType")); + return type; + } + + return word(); } void meshGenGUI::setDefaultPatchType(const word& type) { - if( renameBoundaryEntryExist() ) - { - dictionary dict = meshDict_.subDict("renameBoundary"); - meshDict_.remove("renameBoundary"); - - if( dict.found("defaultType") ) - dict.remove("defaultType"); - - dict.add("defaultType", type); - meshDict_.add("renameBoundary", dict); - } - else - { - dictionary dict; - dict.add("defaultType", type); - meshDict_.add("renameBoundary", dict); - } + if( renameBoundaryEntryExist() ) + { + dictionary dict = meshDict_.subDict("renameBoundary"); + meshDict_.remove("renameBoundary"); + + if( dict.found("defaultType") ) + dict.remove("defaultType"); + + dict.add("defaultType", type); + meshDict_.add("renameBoundary", dict); + } + else + { + dictionary dict; + dict.add("defaultType", type); + meshDict_.add("renameBoundary", dict); + } } void meshGenGUI::removeDefaultPatchType() { - if( renameBoundaryEntryExist() ) - { - dictionary dict = meshDict_.subDict("renameBoundary"); - meshDict_.remove("renameBoundary"); - - dict.remove("defaultType"); - - if( dict.toc().size() != 0 ) - meshDict_.add("renameBoundary", dict); - } + if( renameBoundaryEntryExist() ) + { + dictionary dict = meshDict_.subDict("renameBoundary"); + meshDict_.remove("renameBoundary"); + + dict.remove("defaultType"); + + if( dict.toc().size() != 0 ) + meshDict_.add("renameBoundary", dict); + } } bool meshGenGUI::newPatchNamesEntryExist() const { - if( renameBoundaryEntryExist() ) - { - const dictionary& dict = meshDict_.subDict("renameBoundary"); - - if( dict.found("newPatchNames") ) - return true; - } - - return false; + if( renameBoundaryEntryExist() ) + { + const dictionary& dict = meshDict_.subDict("renameBoundary"); + + if( dict.found("newPatchNames") ) + return true; + } + + return false; } PtrList meshGenGUI::newPatchNames() const { - if( newPatchNamesEntryExist() ) - { - const dictionary& dict = meshDict_.subDict("renameBoundary"); - Istream& is = dict.lookup("newPatchNames"); + if( newPatchNamesEntryExist() ) + { + const dictionary& dict = meshDict_.subDict("renameBoundary"); + Istream& is = dict.lookup("newPatchNames"); - PtrList patchEntries(is); - return patchEntries; - } - - return PtrList(); + PtrList patchEntries(is); + return patchEntries; + } + + return PtrList(); } void meshGenGUI::addNewPatchName(const word& name, const dictionary& pDict) { - if( renameBoundaryEntryExist() ) - { - dictionary& dict = - const_cast(meshDict_.subDict("renameBoundary")); - - if( dict.found("newPatchNames") ) - { - Istream& is = dict.lookup("newPatchNames"); - PtrList entries(is); - - const label s = entries.size(); - entries.setSize(s+1); - entries.set(s, new dictionaryEntry(name, pDict)); - - dict.remove("newPatchNames"); - dict.add("newPatchNames", entries); - } - else - { - PtrList entries(1); - entries.set(0, new dictionaryEntry(name, pDict)); - dict.add("newPatchNames", entries); - } - } - else - { - PtrList entries(1); - entries.set(0, new dictionaryEntry(name, pDict)); - dictionary dict; - dict.add("newPatchNames", entries); - meshDict_.add("renameBoundary", dict); - } + if( renameBoundaryEntryExist() ) + { + dictionary& dict = + const_cast(meshDict_.subDict("renameBoundary")); + + if( dict.found("newPatchNames") ) + { + Istream& is = dict.lookup("newPatchNames"); + PtrList entries(is); + + const label s = entries.size(); + entries.setSize(s+1); + entries.set(s, new dictionaryEntry(name, pDict)); + + dict.remove("newPatchNames"); + dict.add("newPatchNames", entries); + } + else + { + PtrList entries(1); + entries.set(0, new dictionaryEntry(name, pDict)); + dict.add("newPatchNames", entries); + } + } + else + { + PtrList entries(1); + entries.set(0, new dictionaryEntry(name, pDict)); + dictionary dict; + dict.add("newPatchNames", entries); + meshDict_.add("renameBoundary", dict); + } } void meshGenGUI::removePatchName(const word& name) { - if( newPatchNamesEntryExist() ) - { - dictionary& dict = - const_cast(meshDict_.subDict("renameBoundary")); - - Istream& is = dict.lookup("newPatchNames"); - PtrList entries(is); - - PtrList newEntries(entries.size()-1); - label counter(0); - - forAll(entries, i) - { - if( entries[i].keyword() == name ) - continue; - - newEntries.set - ( - counter++, - new dictionaryEntry(entries[i].keyword(), entries[i].dict()) - ); - } - - dict.remove("newPatchNames"); - - if( newEntries.size() != 0 ) - dict.add("newPatchNames", newEntries); - - if( dict.toc().size() == 0 ) - meshDict_.remove("renameBoundary"); - } + if( newPatchNamesEntryExist() ) + { + dictionary& dict = + const_cast(meshDict_.subDict("renameBoundary")); + + Istream& is = dict.lookup("newPatchNames"); + PtrList entries(is); + + PtrList newEntries(entries.size()-1); + label counter(0); + + forAll(entries, i) + { + if( entries[i].keyword() == name ) + continue; + + newEntries.set + ( + counter++, + new dictionaryEntry(entries[i].keyword(), entries[i].dict()) + ); + } + + dict.remove("newPatchNames"); + + if( newEntries.size() != 0 ) + dict.add("newPatchNames", newEntries); + + if( dict.toc().size() == 0 ) + meshDict_.remove("renameBoundary"); + } } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenQt/meshGenQt.C b/GUI/meshGenQt/meshGenQt.C index a3f56d7..b6f304c 100755 --- a/GUI/meshGenQt/meshGenQt.C +++ b/GUI/meshGenQt/meshGenQt.C @@ -48,16 +48,16 @@ meshGenQt::meshGenQt label argc, char* argv[], const objectRegistry& reg ) : - QMainWindow(), - meshGui_(reg), - saveButtonPtr_(NULL), - quitButtonPtr_(NULL), - tabWidgetPtr_(NULL), - tabGeneralSettingsPtr_(NULL), - tabRefinementPtr_(NULL), - tabPatchRenamePtr_(NULL) + QMainWindow(), + meshGui_(reg), + saveButtonPtr_(NULL), + quitButtonPtr_(NULL), + tabWidgetPtr_(NULL), + tabGeneralSettingsPtr_(NULL), + tabRefinementPtr_(NULL), + tabPatchRenamePtr_(NULL) { - createMainWindow(); + createMainWindow(); } // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // @@ -70,40 +70,40 @@ meshGenQt::~meshGenQt() void meshGenQt::createMainWindow() { - QWidget* widget = new QWidget(this); - widget->setGeometry(QRect(0, 0, 600, 480)); - - //- create and add save button - saveButtonPtr_ = new QPushButton(QString("Save meshDict"), widget); - saveButtonPtr_->setGeometry(QRect(11, 11, 150, 24)); - connect - ( - saveButtonPtr_, - SIGNAL(clicked()), - this, - SLOT(saveMeshDictCallback()) - ); - - //- create and add quit button - quitButtonPtr_ = new QPushButton(QString("Quit"), widget); - quitButtonPtr_->setGeometry(QRect(160, 11, 180, 24)); - connect(quitButtonPtr_, SIGNAL(clicked()), qApp, SLOT(quit())); - - //- create the table + QWidget* widget = new QWidget(this); + widget->setGeometry(QRect(0, 0, 600, 480)); + + //- create and add save button + saveButtonPtr_ = new QPushButton(QString("Save meshDict"), widget); + saveButtonPtr_->setGeometry(QRect(11, 11, 150, 24)); + connect + ( + saveButtonPtr_, + SIGNAL(clicked()), + this, + SLOT(saveMeshDictCallback()) + ); + + //- create and add quit button + quitButtonPtr_ = new QPushButton(QString("Quit"), widget); + quitButtonPtr_->setGeometry(QRect(160, 11, 180, 24)); + connect(quitButtonPtr_, SIGNAL(clicked()), qApp, SLOT(quit())); + + //- create the table tabWidgetPtr_ = new QTabWidget(widget); - tabWidgetPtr_->setGeometry(QRect(9, 41, 580, 406)); - - tabGeneralSettingsPtr_ = new meshGenQtGeneralSettings(widget, meshGui_); - tabWidgetPtr_->addTab(tabGeneralSettingsPtr_, "General settings"); - - QWidget* tab1 = new QWidget(); - tabWidgetPtr_->addTab(tab1, "Refinement"); - - //- set the front page - this->setCentralWidget(widget); - - //- resize to the desired size - QSize size(600, 480); + tabWidgetPtr_->setGeometry(QRect(9, 41, 580, 406)); + + tabGeneralSettingsPtr_ = new meshGenQtGeneralSettings(widget, meshGui_); + tabWidgetPtr_->addTab(tabGeneralSettingsPtr_, "General settings"); + + QWidget* tab1 = new QWidget(); + tabWidgetPtr_->addTab(tab1, "Refinement"); + + //- set the front page + this->setCentralWidget(widget); + + //- resize to the desired size + QSize size(600, 480); size = size.expandedTo(this->minimumSizeHint()); this->resize(size); } diff --git a/GUI/meshGenQt/meshGenQt.H b/GUI/meshGenQt/meshGenQt.H index 95bf8a3..2e49675 100755 --- a/GUI/meshGenQt/meshGenQt.H +++ b/GUI/meshGenQt/meshGenQt.H @@ -62,39 +62,39 @@ class meshGenQtGeneralSettings; class meshGenQt : - public QMainWindow + public QMainWindow { - Q_OBJECT - - // Private data - - //- mesh generation dictionary - meshGenGUI meshGui_; - - //- main window data - QPushButton* saveButtonPtr_; - QPushButton* quitButtonPtr_; - QTabWidget* tabWidgetPtr_; - meshGenQtGeneralSettings* tabGeneralSettingsPtr_; - QWidget* tabRefinementPtr_; - QWidget* tabPatchRenamePtr_; - + Q_OBJECT + + // Private data + + //- mesh generation dictionary + meshGenGUI meshGui_; + + //- main window data + QPushButton* saveButtonPtr_; + QPushButton* quitButtonPtr_; + QTabWidget* tabWidgetPtr_; + meshGenQtGeneralSettings* tabGeneralSettingsPtr_; + QWidget* tabRefinementPtr_; + QWidget* tabPatchRenamePtr_; + private slots: - - // Private callback functions + + // Private callback functions - //- save meshDict file - void saveMeshDictCallback() - { - meshGui_.writeDict(); - } + //- save meshDict file + void saveMeshDictCallback() + { + meshGui_.writeDict(); + } private: - - // Private member functions - - //- create main window - void createMainWindow(); + + // Private member functions + + //- create main window + void createMainWindow(); //- Disallow default bitwise copy construct meshGenQt(const meshGenQt&); diff --git a/GUI/meshGenQt/meshGenQtGeneralSettings.C b/GUI/meshGenQt/meshGenQtGeneralSettings.C index cb32df5..6320da3 100755 --- a/GUI/meshGenQt/meshGenQtGeneralSettings.C +++ b/GUI/meshGenQt/meshGenQtGeneralSettings.C @@ -47,19 +47,19 @@ meshGenQtGeneralSettings::meshGenQtGeneralSettings ::QWidget* parent, meshGenGUI& meshGui ) : - QWidget(parent), - meshGui_(meshGui), - openButtonPtr_(NULL), - surfaceFileEditPtr_(NULL), - maxCellSizeEditPtr_(NULL), - bndCellSizeCheckPtr_(NULL), - bndCellSizeEditPtr_(NULL), - autoRefineCheckPtr_(NULL), - autoRefineCellSizeEditPtr_(NULL), - keepBndCellsCheckPtr_(NULL), - gluedMeshCheckPtr_(NULL) + QWidget(parent), + meshGui_(meshGui), + openButtonPtr_(NULL), + surfaceFileEditPtr_(NULL), + maxCellSizeEditPtr_(NULL), + bndCellSizeCheckPtr_(NULL), + bndCellSizeEditPtr_(NULL), + autoRefineCheckPtr_(NULL), + autoRefineCellSizeEditPtr_(NULL), + keepBndCellsCheckPtr_(NULL), + gluedMeshCheckPtr_(NULL) { - createWindow(); + createWindow(); } // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // @@ -72,84 +72,84 @@ meshGenQtGeneralSettings::~meshGenQtGeneralSettings() void meshGenQtGeneralSettings::createWindow() { - QGridLayout* gridLayout = new QGridLayout(this); + QGridLayout* gridLayout = new QGridLayout(this); gridLayout->setSpacing(6); gridLayout->setMargin(11); - //- set surface file name + //- set surface file name QLabel* surfaceLabel = new QLabel(QString("Surface file name"), this); gridLayout->addWidget(surfaceLabel, 0, 0); surfaceFileEditPtr_ = new QLineEdit(this); - surfaceFileEditPtr_->setText(meshGui_.surfaceFileName()); + surfaceFileEditPtr_->setText(meshGui_.surfaceFileName()); gridLayout->addWidget(surfaceFileEditPtr_, 0, 1); openButtonPtr_ = new QPushButton(QString("Open"), this); - connect(openButtonPtr_, SIGNAL(clicked()), this, SLOT(openSurfaceFile())); + connect(openButtonPtr_, SIGNAL(clicked()), this, SLOT(openSurfaceFile())); gridLayout->addWidget(openButtonPtr_, 0, 3); - //- set max cell size + //- set max cell size QLabel* maxCellSize = new QLabel(QString("Max cell size [m]"), this); gridLayout->addWidget(maxCellSize, 1, 0); maxCellSizeEditPtr_ = new QLineEdit(this); - maxCellSizeEditPtr_->setText(help::scalarToText(meshGui_.maxCellSize())); + maxCellSizeEditPtr_->setText(help::scalarToText(meshGui_.maxCellSize())); gridLayout->addWidget(maxCellSizeEditPtr_, 1, 1); - - connect - ( - maxCellSizeEditPtr_, - SIGNAL(textChanged(const QString&)), - this, - SLOT(setMaxCellSize(const QString&)) - ); - - QFrame* line1 = new QFrame(this); + + connect + ( + maxCellSizeEditPtr_, + SIGNAL(textChanged(const QString&)), + this, + SLOT(setMaxCellSize(const QString&)) + ); + + QFrame* line1 = new QFrame(this); //line1->setObjectName(QString::fromUtf8("line1")); line1->setFrameShape(QFrame::HLine); line1->setFrameShadow(QFrame::Sunken); gridLayout->addMultiCellWidget(line1, 2, 2, 0, 3); - //- bnd cell size settings + //- bnd cell size settings bndCellSizeCheckPtr_ = - new QCheckBox(QString("Use different boundary cell size"), this); + new QCheckBox(QString("Use different boundary cell size"), this); gridLayout->addMultiCellWidget(bndCellSizeCheckPtr_, 3, 3, 0, 2); bndCellSizeEditPtr_ = new QLineEdit(this); - - if( meshGui_.boundaryCellSizeEntryExist() ) - { - bndCellSizeCheckPtr_->setChecked(true); - bndCellSizeEditPtr_->setText - ( - help::scalarToText(meshGui_.boundaryCellSize()) - ); - } - else - { - bndCellSizeEditPtr_->setReadOnly(true); - } - - connect - ( - bndCellSizeCheckPtr_, - SIGNAL(clicked()), - this, - SLOT(activateBndCellSize()) - ); - - connect - ( - bndCellSizeEditPtr_, - SIGNAL(textChanged(const QString&)), - this, - SLOT(setBndCellSize(const QString&)) - ); - + + if( meshGui_.boundaryCellSizeEntryExist() ) + { + bndCellSizeCheckPtr_->setChecked(true); + bndCellSizeEditPtr_->setText + ( + help::scalarToText(meshGui_.boundaryCellSize()) + ); + } + else + { + bndCellSizeEditPtr_->setReadOnly(true); + } + + connect + ( + bndCellSizeCheckPtr_, + SIGNAL(clicked()), + this, + SLOT(activateBndCellSize()) + ); + + connect + ( + bndCellSizeEditPtr_, + SIGNAL(textChanged(const QString&)), + this, + SLOT(setBndCellSize(const QString&)) + ); + gridLayout->addWidget(bndCellSizeEditPtr_, 4, 1); QLabel* bndCellSize = new QLabel(QString("Bnd cell size [m]"), this); @@ -162,96 +162,96 @@ void meshGenQtGeneralSettings::createWindow() gridLayout->addMultiCellWidget(line2, 5, 5, 0, 3); - //- auto refinement settings + //- auto refinement settings autoRefineCheckPtr_ = new QCheckBox("Use automatic refinement", this); - - connect - ( - autoRefineCheckPtr_, - SIGNAL(clicked()), - this, - SLOT(activateMinCellSize()) - ); + + connect + ( + autoRefineCheckPtr_, + SIGNAL(clicked()), + this, + SLOT(activateMinCellSize()) + ); gridLayout->addMultiCellWidget(autoRefineCheckPtr_, 6, 6, 0, 2); QLabel* minCellSize = new QLabel(QString("Min cell size [m]"), this); gridLayout->addWidget(minCellSize, 7, 0); - - autoRefineCellSizeEditPtr_ = new QLineEdit(this); - gridLayout->addWidget(autoRefineCellSizeEditPtr_, 7, 1); - - if( meshGui_.minCellSizeEntryExist() ) - { - autoRefineCheckPtr_->setChecked(true); - autoRefineCellSizeEditPtr_->setText - ( - help::scalarToText(meshGui_.minCellSize()) - ); - } - else - { - autoRefineCellSizeEditPtr_->setReadOnly(true); - } - - connect - ( - autoRefineCellSizeEditPtr_, - SIGNAL(textChanged(const QString&)), - this, - SLOT(setMinCellSize(const QString&)) - ); - - QFrame* line3 = new QFrame(this); + + autoRefineCellSizeEditPtr_ = new QLineEdit(this); + gridLayout->addWidget(autoRefineCellSizeEditPtr_, 7, 1); + + if( meshGui_.minCellSizeEntryExist() ) + { + autoRefineCheckPtr_->setChecked(true); + autoRefineCellSizeEditPtr_->setText + ( + help::scalarToText(meshGui_.minCellSize()) + ); + } + else + { + autoRefineCellSizeEditPtr_->setReadOnly(true); + } + + connect + ( + autoRefineCellSizeEditPtr_, + SIGNAL(textChanged(const QString&)), + this, + SLOT(setMinCellSize(const QString&)) + ); + + QFrame* line3 = new QFrame(this); line3->setFrameShape(QFrame::HLine); line3->setFrameShadow(QFrame::Sunken); gridLayout->addMultiCellWidget(line3, 8, 8, 0, 3); - //- keep boundary intersected cells + //- keep boundary intersected cells keepBndCellsCheckPtr_ = - new QCheckBox(QString("Keep cell intersecting boundary"), this); - - if( meshGui_.keepCellsIntersectingBoundaryEntryExist() ) - { - keepBndCellsCheckPtr_->setChecked(true); - } - else - { - keepBndCellsCheckPtr_->setChecked(false); - } - - connect - ( - keepBndCellsCheckPtr_, - SIGNAL(clicked()), - this, - SLOT(activateKeepCellsIntersectingBoundary()) - ); - + new QCheckBox(QString("Keep cell intersecting boundary"), this); + + if( meshGui_.keepCellsIntersectingBoundaryEntryExist() ) + { + keepBndCellsCheckPtr_->setChecked(true); + } + else + { + keepBndCellsCheckPtr_->setChecked(false); + } + + connect + ( + keepBndCellsCheckPtr_, + SIGNAL(clicked()), + this, + SLOT(activateKeepCellsIntersectingBoundary()) + ); + gridLayout->addMultiCellWidget(keepBndCellsCheckPtr_, 9, 9, 0, 2); - //- remove glued mesh + //- remove glued mesh gluedMeshCheckPtr_ = - new QCheckBox(QString("Remove glued mesh parts"), this); - - if( meshGui_.checkForGluedMeshEntryExist() ) - { - gluedMeshCheckPtr_->setChecked(true); - } - else - { - gluedMeshCheckPtr_->setChecked(false); - } - - connect - ( - gluedMeshCheckPtr_, - SIGNAL(clicked()), - this, - SLOT(activateCheckForGluedMesh()) - ); - + new QCheckBox(QString("Remove glued mesh parts"), this); + + if( meshGui_.checkForGluedMeshEntryExist() ) + { + gluedMeshCheckPtr_->setChecked(true); + } + else + { + gluedMeshCheckPtr_->setChecked(false); + } + + connect + ( + gluedMeshCheckPtr_, + SIGNAL(clicked()), + this, + SLOT(activateCheckForGluedMesh()) + ); + gridLayout->addMultiCellWidget(gluedMeshCheckPtr_, 10, 10, 0, 2); } @@ -260,117 +260,117 @@ void meshGenQtGeneralSettings::createWindow() void meshGenQtGeneralSettings::openSurfaceFile() { - QString fn = - QFileDialog::getOpenFileName - ( - QString::null, - "Surface files (*.ftr *.stl)", - this - ); - - if( !fn.isEmpty() ) + QString fn = + QFileDialog::getOpenFileName + ( + QString::null, + "Surface files (*.ftr *.stl)", + this + ); + + if( !fn.isEmpty() ) { - surfaceFileEditPtr_->setText(fn); - fileName fName(fn.ascii()); - meshGui_.setSurfaceFileName(fName); - } + surfaceFileEditPtr_->setText(fn); + fileName fName(fn.ascii()); + meshGui_.setSurfaceFileName(fName); + } } void meshGenQtGeneralSettings::setMaxCellSize(const QString& s) { - const word sn(s.ascii()); - - const scalar size = help::textToScalar(sn); - meshGui_.setMaxCellSize(size); + const word sn(s.ascii()); + + const scalar size = help::textToScalar(sn); + meshGui_.setMaxCellSize(size); } void meshGenQtGeneralSettings::activateBndCellSize() { - if( bndCellSizeCheckPtr_->isChecked() ) - { - bndCellSizeEditPtr_->setReadOnly(false); - } - else - { - bndCellSizeEditPtr_->setText(QString("")); - bndCellSizeEditPtr_->setReadOnly(true); - meshGui_.removeBoundaryCellSize(); - } + if( bndCellSizeCheckPtr_->isChecked() ) + { + bndCellSizeEditPtr_->setReadOnly(false); + } + else + { + bndCellSizeEditPtr_->setText(QString("")); + bndCellSizeEditPtr_->setReadOnly(true); + meshGui_.removeBoundaryCellSize(); + } } void meshGenQtGeneralSettings::setBndCellSize(const QString& s) { - if( bndCellSizeCheckPtr_->isChecked() ) - { - const word sn(s.ascii()); - - const scalar size = help::textToScalar(sn); - meshGui_.setBoundaryCellSize(size); - } + if( bndCellSizeCheckPtr_->isChecked() ) + { + const word sn(s.ascii()); + + const scalar size = help::textToScalar(sn); + meshGui_.setBoundaryCellSize(size); + } } void meshGenQtGeneralSettings::activateMinCellSize() { - if( autoRefineCheckPtr_->isChecked() ) - { - autoRefineCellSizeEditPtr_->setReadOnly(false); - } - else - { - autoRefineCellSizeEditPtr_->setText(QString("")); - autoRefineCellSizeEditPtr_->setReadOnly(true); - meshGui_.removeMinCellSize(); - } + if( autoRefineCheckPtr_->isChecked() ) + { + autoRefineCellSizeEditPtr_->setReadOnly(false); + } + else + { + autoRefineCellSizeEditPtr_->setText(QString("")); + autoRefineCellSizeEditPtr_->setReadOnly(true); + meshGui_.removeMinCellSize(); + } } void meshGenQtGeneralSettings::setMinCellSize(const QString& s) { - if( bndCellSizeCheckPtr_->isChecked() ) - { - const word sn(s.ascii()); - - const scalar size = help::textToScalar(sn); - meshGui_.setMinCellSize(size); - } + if( bndCellSizeCheckPtr_->isChecked() ) + { + const word sn(s.ascii()); + + const scalar size = help::textToScalar(sn); + meshGui_.setMinCellSize(size); + } } void meshGenQtGeneralSettings::activateKeepCellsIntersectingBoundary() { - if( keepBndCellsCheckPtr_->isChecked() ) - { - meshGui_.setKeepCellsIntersectingBoundary(); - } - else - { - meshGui_.removeKeepCellsIntersectingBoundary(); - - if( gluedMeshCheckPtr_->isChecked() ) - { - gluedMeshCheckPtr_->setChecked(false); - meshGui_.removeCheckForGluedMesh(); - } - } + if( keepBndCellsCheckPtr_->isChecked() ) + { + meshGui_.setKeepCellsIntersectingBoundary(); + } + else + { + meshGui_.removeKeepCellsIntersectingBoundary(); + + if( gluedMeshCheckPtr_->isChecked() ) + { + gluedMeshCheckPtr_->setChecked(false); + meshGui_.removeCheckForGluedMesh(); + } + } } - + void meshGenQtGeneralSettings::activateCheckForGluedMesh() { - if( keepBndCellsCheckPtr_->isChecked() ) - { - meshGui_.setCheckForGluedMesh(); - - if( gluedMeshCheckPtr_->isChecked() ) - { - meshGui_.setCheckForGluedMesh(); - } - else - { - meshGui_.removeCheckForGluedMesh(); - } - } - else - { - meshGui_.removeCheckForGluedMesh(); - } + if( keepBndCellsCheckPtr_->isChecked() ) + { + meshGui_.setCheckForGluedMesh(); + + if( gluedMeshCheckPtr_->isChecked() ) + { + meshGui_.setCheckForGluedMesh(); + } + else + { + meshGui_.removeCheckForGluedMesh(); + } + } + else + { + meshGui_.removeCheckForGluedMesh(); + } } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/GUI/meshGenQt/meshGenQtGeneralSettings.H b/GUI/meshGenQt/meshGenQtGeneralSettings.H index 149df8c..cea1a84 100755 --- a/GUI/meshGenQt/meshGenQtGeneralSettings.H +++ b/GUI/meshGenQt/meshGenQtGeneralSettings.H @@ -59,63 +59,63 @@ namespace Foam class meshGenQtGeneralSettings : - public QWidget + public QWidget { - Q_OBJECT - - // Private data - - //- mesh generation dictionary - meshGenGUI& meshGui_; - - //- main window data - QPushButton* openButtonPtr_; - QLineEdit* surfaceFileEditPtr_; - QLineEdit* maxCellSizeEditPtr_; - - QCheckBox* bndCellSizeCheckPtr_; - QLineEdit* bndCellSizeEditPtr_; - - QCheckBox* autoRefineCheckPtr_; - QLineEdit* autoRefineCellSizeEditPtr_; - - QCheckBox* keepBndCellsCheckPtr_; - QCheckBox* gluedMeshCheckPtr_; - + Q_OBJECT + + // Private data + + //- mesh generation dictionary + meshGenGUI& meshGui_; + + //- main window data + QPushButton* openButtonPtr_; + QLineEdit* surfaceFileEditPtr_; + QLineEdit* maxCellSizeEditPtr_; + + QCheckBox* bndCellSizeCheckPtr_; + QLineEdit* bndCellSizeEditPtr_; + + QCheckBox* autoRefineCheckPtr_; + QLineEdit* autoRefineCellSizeEditPtr_; + + QCheckBox* keepBndCellsCheckPtr_; + QCheckBox* gluedMeshCheckPtr_; + private slots: - - // Private callback functions + + // Private callback functions - //- open surface file - void openSurfaceFile(); - - //- set max cell size - void setMaxCellSize(const QString&); + //- open surface file + void openSurfaceFile(); + + //- set max cell size + void setMaxCellSize(const QString&); - //- set activity of bndCellSize - void activateBndCellSize(); + //- set activity of bndCellSize + void activateBndCellSize(); - //- set bndCellSize - void setBndCellSize(const QString&); + //- set bndCellSize + void setBndCellSize(const QString&); - //- set activity of auto refinement - void activateMinCellSize(); + //- set activity of auto refinement + void activateMinCellSize(); - //- set min size in auto refinement - void setMinCellSize(const QString&); + //- set min size in auto refinement + void setMinCellSize(const QString&); - //- set activity of keepCellsIntersectingBoundary - void activateKeepCellsIntersectingBoundary(); - - //- set activity of glued mesh check - void activateCheckForGluedMesh(); - + //- set activity of keepCellsIntersectingBoundary + void activateKeepCellsIntersectingBoundary(); + + //- set activity of glued mesh check + void activateCheckForGluedMesh(); + private: - - // Private member functions - - //- create window - void createWindow(); + + // Private member functions + + //- create window + void createWindow(); //- Disallow default bitwise copy construct meshGenQtGeneralSettings(const meshGenQtGeneralSettings&); diff --git a/executables/cartesianMesh/cartesianMesh.C b/executables/cartesianMesh/cartesianMesh.C index c01d5d6..682ba23 100644 --- a/executables/cartesianMesh/cartesianMesh.C +++ b/executables/cartesianMesh/cartesianMesh.C @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s\n" << "ClockTime = " << runTime.elapsedClockTime() << " s" << endl; - + omg.writeMesh(); Info << "End\n" << endl; diff --git a/executables/dualMesh/dualMesh.C b/executables/dualMesh/dualMesh.C index 3f021c3..62a5b1a 100644 --- a/executables/dualMesh/dualMesh.C +++ b/executables/dualMesh/dualMesh.C @@ -27,8 +27,8 @@ Application Description - creates an octree and generates its dual. - - dual is used as mesh template which is the treated to conform to - - the geometry surface + - dual is used as mesh template which is the treated to conform to + - the geometry surface \*---------------------------------------------------------------------------*/ @@ -48,10 +48,10 @@ int main(int argc, char *argv[]) # include "createTime.H" dualMeshGenerator omg(runTime); - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s\n" << "ClockTime = " << runTime.elapsedClockTime() << endl; - + omg.writeMesh(); Info << "End\n" << endl; diff --git a/executables/hexMesh/hexMesh.C b/executables/hexMesh/hexMesh.C index d88ca70..2ddc0fa 100644 --- a/executables/hexMesh/hexMesh.C +++ b/executables/hexMesh/hexMesh.C @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s\n" << "ClockTime = " << runTime.elapsedClockTime() << " s" << endl; - + omg.writeMesh(); Info << "End\n" << endl; diff --git a/executables/pMesh/pMesh.C b/executables/pMesh/pMesh.C index ea48e0d..3edc8d8 100644 --- a/executables/pMesh/pMesh.C +++ b/executables/pMesh/pMesh.C @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s\n" << "ClockTime = " << runTime.elapsedClockTime() << endl; - + omg.writeMesh(); Info << "End\n" << endl; diff --git a/executables/tetMesh/tetMesh.C b/executables/tetMesh/tetMesh.C index e84f6b3..391d814 100644 --- a/executables/tetMesh/tetMesh.C +++ b/executables/tetMesh/tetMesh.C @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s\n" << "ClockTime = " << runTime.elapsedClockTime() << endl; - + omg.writeMesh(); Info << "End\n" << endl; diff --git a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C index 5c7e346..075620b 100644 --- a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C +++ b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C @@ -40,7 +40,7 @@ namespace Foam void cartesianMeshExtractor::clearOut() { - deleteDemandDrivenData(leafCellLabelPtr_); + deleteDemandDrivenData(leafCellLabelPtr_); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -49,14 +49,14 @@ void cartesianMeshExtractor::clearOut() cartesianMeshExtractor::cartesianMeshExtractor ( meshOctree& octree, - const IOdictionary& meshDict, - polyMeshGen& mesh + const IOdictionary& meshDict, + polyMeshGen& mesh ) : octreeCheck_(octree, meshDict, false), - mesh_(mesh), - decomposeSplitHexes_(false), - leafCellLabelPtr_(new labelList(octree.numberOfLeaves(), -1)) + mesh_(mesh), + decomposeSplitHexes_(false), + leafCellLabelPtr_(new labelList(octree.numberOfLeaves(), -1)) { } @@ -64,36 +64,36 @@ cartesianMeshExtractor::cartesianMeshExtractor cartesianMeshExtractor::~cartesianMeshExtractor() { - clearOut(); + clearOut(); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // void cartesianMeshExtractor::decomposeSplitHexes() { - decomposeSplitHexes_ = true; + decomposeSplitHexes_ = true; } void cartesianMeshExtractor::createMesh() { - Info << "Extracting polyMesh" << endl; - - //- create points and pointLeaves addressing + Info << "Extracting polyMesh" << endl; + + //- create points and pointLeaves addressing createPointsAndAddressing(); - //- create the mesh + //- create the mesh createPolyMesh(); //- decompose split-hex cells into tetrahedra and pyramids decomposeSplitHexesIntoTetsAndPyramids(); - - //- remove unused vertices - polyMeshGenModifier(mesh_).removeUnusedVertices(); - - Info << "Mesh has :" << nl - << mesh_.points().size() << " vertices " << nl - << mesh_.faces().size() << " faces" << nl - << mesh_.cells().size() << " cells" << endl; + + //- remove unused vertices + polyMeshGenModifier(mesh_).removeUnusedVertices(); + + Info << "Mesh has :" << nl + << mesh_.points().size() << " vertices " << nl + << mesh_.faces().size() << " faces" << nl + << mesh_.cells().size() << " cells" << endl; if( Pstream::parRun() ) { @@ -113,7 +113,7 @@ void cartesianMeshExtractor::createMesh() << " This can be reolved by reducing the maxCellSize by a fraction." << "i.e. 2.49999 instead of 2.5." << exit(FatalError); } - + Info << "Finished extracting polyMesh" << endl; } diff --git a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H index d44bdd6..8459f38 100644 --- a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H +++ b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H @@ -43,7 +43,7 @@ SourceFiles namespace Foam { - + class IOdictionary; /*---------------------------------------------------------------------------*\ @@ -55,28 +55,28 @@ class cartesianMeshExtractor // Private data //- reference to the octree addressing meshOctreeAddressing octreeCheck_; - - //- reference to the mesh - polyMeshGen& mesh_; - - //- decompose split hex cells - bool decomposeSplitHexes_; - - //- cell label for a given leaf - labelList* leafCellLabelPtr_; + + //- reference to the mesh + polyMeshGen& mesh_; + + //- decompose split hex cells + bool decomposeSplitHexes_; + + //- cell label for a given leaf + labelList* leafCellLabelPtr_; // Private member functions - //- delete all freestore data - void clearOut(); + //- delete all freestore data + void clearOut(); //- create vertices and pointLeaves addressing void createPointsAndAddressing(); //- create mesh data void createPolyMesh(); - - //- decompose split hexes into pyramids and tets - void decomposeSplitHexesIntoTetsAndPyramids(); + + //- decompose split hexes into pyramids and tets + void decomposeSplitHexesIntoTetsAndPyramids(); // Private copy constructor //- Disallow default bitwise copy construct @@ -93,8 +93,8 @@ public: cartesianMeshExtractor ( meshOctree& octree, - const IOdictionary& meshDict, - polyMeshGen& mesh + const IOdictionary& meshDict, + polyMeshGen& mesh ); // Destructor @@ -104,11 +104,11 @@ public: // Member Functions - //- decompose split hexes into standard cells - void decomposeSplitHexes(); - - //- create the mesh with the above options - void createMesh(); + //- decompose split hexes into standard cells + void decomposeSplitHexes(); + + //- create the mesh with the above options + void createMesh(); }; diff --git a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C index 097ad7d..7ba87ef 100644 --- a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C +++ b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C @@ -43,11 +43,11 @@ namespace Foam void cartesianMeshExtractor::decomposeSplitHexesIntoTetsAndPyramids() { - if( !decomposeSplitHexes_ ) return; + if( !decomposeSplitHexes_ ) return; - Info << "Decomposing split-hex cells" << endl; - - const faceListPMG& faces = mesh_.faces(); + Info << "Decomposing split-hex cells" << endl; + + const faceListPMG& faces = mesh_.faces(); //- decompose faces which have more than 4 vertices boolList decompose(faces.size(), false); @@ -100,8 +100,8 @@ void cartesianMeshExtractor::decomposeSplitHexesIntoTetsAndPyramids() decomposeCells dc(mesh_); dc.decomposeMesh(decompose); } - - Info << "Finished decomposing split-hex cells" << endl; + + Info << "Finished decomposing split-hex cells" << endl; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPointsAndAddressing.C b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPointsAndAddressing.C index c76d282..a9fa1f3 100644 --- a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPointsAndAddressing.C +++ b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPointsAndAddressing.C @@ -42,10 +42,10 @@ void cartesianMeshExtractor::createPointsAndAddressing() Info << "Creating octree vertices" << endl; //- set the size of the point field - pointFieldPMG& points = mesh_.points(); - points.setSize(octreeCheck_.numberOfNodes()); - - //- store vertices into the pointField + pointFieldPMG& points = mesh_.points(); + points.setSize(octreeCheck_.numberOfNodes()); + + //- store vertices into the pointField const pointField& octreePoints = octreeCheck_.octreePoints(); forAll(points, pointI) diff --git a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C index 79c2192..9616fb9 100644 --- a/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C +++ b/meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C @@ -52,13 +52,13 @@ namespace Foam void cartesianMeshExtractor::createPolyMesh() { Info << "Creating polyMesh from octree" << endl; - - const meshOctree& octree = octreeCheck_.octree(); - + + const meshOctree& octree = octreeCheck_.octree(); + //- give labels to cubes which will be used as mesh cells - const List& cType = octreeCheck_.boxType(); - - labelList& leafCellLabel = *leafCellLabelPtr_; + const List& cType = octreeCheck_.boxType(); + + labelList& leafCellLabel = *leafCellLabelPtr_; label nCells(0); forAll(cType, leafI) { @@ -74,12 +74,12 @@ void cartesianMeshExtractor::createPolyMesh() } } - //- access to mesh data - polyMeshGenModifier meshModifier(mesh_); - faceListPMG& faces = meshModifier.facesAccess(); - cellListPMG& cells = meshModifier.cellsAccess(); - - //- start creating octree mesh + //- access to mesh data + polyMeshGenModifier meshModifier(mesh_); + faceListPMG& faces = meshModifier.facesAccess(); + cellListPMG& cells = meshModifier.cellsAccess(); + + //- start creating octree mesh cells.setSize(nCells); List nFacesInCell(nCells, direction(0)); label nFaces(0); @@ -321,7 +321,7 @@ void cartesianMeshExtractor::createPolyMesh() vectorField closedness(cells.size(), vector::zero); const labelList& owner = mesh_.owner(); - const labelList& neighbour = mesh_.neighbour(); + const labelList& neighbour = mesh_.neighbour(); forAll(owner, faceI) if( owner[faceI] == -1 ) { @@ -353,7 +353,7 @@ void cartesianMeshExtractor::createPolyMesh() # endif - meshModifier.reorderBoundaryFaces(); + meshModifier.reorderBoundaryFaces(); Info << "Finished creating polyMesh" << endl; } diff --git a/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C b/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C index 151e4ae..3da7255 100644 --- a/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C +++ b/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C @@ -65,39 +65,39 @@ namespace Foam void cartesianMeshGenerator::createCartesianMesh() { - //- create polyMesh from octree boxes - cartesianMeshExtractor cme(*octreePtr_, meshDict_, mesh_); - + //- create polyMesh from octree boxes + cartesianMeshExtractor cme(*octreePtr_, meshDict_, mesh_); + if( meshDict_.found("decomposePolyhedraIntoTetsAndPyrs") ) { if( readBool(meshDict_.lookup("decomposePolyhedraIntoTetsAndPyrs")) ) cme.decomposeSplitHexes(); } - cme.createMesh(); - - # ifdef DEBUG - mesh_.write(); - # ifdef DEBUGfpma - writeMeshFPMA(mesh_, "cartesianMesh"); - # else - writeMeshEnsight(mesh_, "cartesianMesh"); - # endif - //::exit(EXIT_FAILURE); - # endif + cme.createMesh(); + + # ifdef DEBUG + mesh_.write(); + # ifdef DEBUGfpma + writeMeshFPMA(mesh_, "cartesianMesh"); + # else + writeMeshEnsight(mesh_, "cartesianMesh"); + # endif + //::exit(EXIT_FAILURE); + # endif } - + void cartesianMeshGenerator::surfacePreparation() { - //- removes unnecessary cells and morph the boundary + //- removes unnecessary cells and morph the boundary //- such that there is only one boundary face per cell - //- It also checks topology of cells after morphing is performed -/* do - { - surfaceMorpherCells* cmPtr = new surfaceMorpherCells(mesh_); - cmPtr->morphMesh(); - deleteDemandDrivenData(cmPtr); - } while( topologicalCleaner(mesh_).cleanTopology() ); + //- It also checks topology of cells after morphing is performed +/* do + { + surfaceMorpherCells* cmPtr = new surfaceMorpherCells(mesh_); + cmPtr->morphMesh(); + deleteDemandDrivenData(cmPtr); + } while( topologicalCleaner(mesh_).cleanTopology() ); */ bool changed; @@ -114,24 +114,24 @@ void cartesianMeshGenerator::surfacePreparation() if( checkCellConnectionsOverFaces(mesh_).checkCellGroups() ) changed = true; - } while( changed ); + } while( changed ); checkBoundaryFacesSharingTwoEdges(mesh_).improveTopology(); - # ifdef DEBUG - mesh_.write(); - # ifdef DEBUGfpma - writeMeshFPMA(mesh_, "afterTopoCleaning"); - # else - writeMeshEnsight(mesh_, "afterTopoCleaning"); - # endif - //::exit(EXIT_FAILURE); - # endif + # ifdef DEBUG + mesh_.write(); + # ifdef DEBUGfpma + writeMeshFPMA(mesh_, "afterTopoCleaning"); + # else + writeMeshEnsight(mesh_, "afterTopoCleaning"); + # endif + //::exit(EXIT_FAILURE); + # endif } - + void cartesianMeshGenerator::mapMeshToSurface() { - //- calculate mesh surface + //- calculate mesh surface meshSurfaceEngine* msePtr = new meshSurfaceEngine(mesh_); //- pre-map mesh surface @@ -139,79 +139,79 @@ void cartesianMeshGenerator::mapMeshToSurface() mapper.preMapVertices(); # ifdef DEBUG - # ifdef DEBUGfpma + # ifdef DEBUGfpma writeMeshFPMA(mesh_, "preMappedMesh"); # else - writeMeshEnsight(mesh_, "preMappedMesh"); - # endif - mesh_.write(); - //::exit(EXIT_FAILURE); - # endif - - //- map mesh surface on the geometry surface - mapper.mapVerticesOntoSurface(); - - # ifdef DEBUG - # ifdef DEBUGfpma - writeMeshFPMA(mesh_, "afterMapping"); - # else - writeMeshEnsight(mesh_, "afterMapping"); - # endif - mesh_.write(); - //::exit(EXIT_FAILURE); - # endif - - //- untangle surface faces - meshSurfaceOptimizer(*msePtr, *octreePtr_).preOptimizeSurface(); - - # ifdef DEBUG - # ifdef DEBUGfpma - writeMeshFPMA(mesh_, "afterSurfaceSmoothing"); - # else - writeMeshEnsight(mesh_, "afterSurfaceSmoothing"); - # endif - mesh_.write(); - //::exit(EXIT_FAILURE); - # endif + writeMeshEnsight(mesh_, "preMappedMesh"); + # endif + mesh_.write(); + //::exit(EXIT_FAILURE); + # endif + + //- map mesh surface on the geometry surface + mapper.mapVerticesOntoSurface(); + + # ifdef DEBUG + # ifdef DEBUGfpma + writeMeshFPMA(mesh_, "afterMapping"); + # else + writeMeshEnsight(mesh_, "afterMapping"); + # endif + mesh_.write(); + //::exit(EXIT_FAILURE); + # endif + + //- untangle surface faces + meshSurfaceOptimizer(*msePtr, *octreePtr_).preOptimizeSurface(); + + # ifdef DEBUG + # ifdef DEBUGfpma + writeMeshFPMA(mesh_, "afterSurfaceSmoothing"); + # else + writeMeshEnsight(mesh_, "afterSurfaceSmoothing"); + # endif + mesh_.write(); + //::exit(EXIT_FAILURE); + # endif deleteDemandDrivenData(msePtr); } void cartesianMeshGenerator::mapEdgesAndCorners() { - meshSurfaceEdgeExtractorNonTopo(mesh_, *octreePtr_); - - # ifdef DEBUG - mesh_.write(); - //meshOptimizer(*octreePtr_, mesh_).preOptimize(); - # ifdef DEBUGfpma - writeMeshFPMA(mesh_, "withEdges"); - # else - writeMeshEnsight(mesh_, "withEdges"); - #endif - //::exit(EXIT_FAILURE); - # endif + meshSurfaceEdgeExtractorNonTopo(mesh_, *octreePtr_); + + # ifdef DEBUG + mesh_.write(); + //meshOptimizer(*octreePtr_, mesh_).preOptimize(); + # ifdef DEBUGfpma + writeMeshFPMA(mesh_, "withEdges"); + # else + writeMeshEnsight(mesh_, "withEdges"); + #endif + //::exit(EXIT_FAILURE); + # endif } void cartesianMeshGenerator::optimiseMeshSurface() { - meshSurfaceEngine mse(mesh_); - meshSurfaceOptimizer(mse, *octreePtr_).optimizeSurface(); - - # ifdef DEBUG - mesh_.write(); - # ifdef DEBUGfpma - writeMeshFPMA(mesh_, "optSurfaceWithEdges"); - # else - writeMeshEnsight(mesh_, "optSurfaceWithEdges"); - #endif - //::exit(EXIT_FAILURE); - # endif + meshSurfaceEngine mse(mesh_); + meshSurfaceOptimizer(mse, *octreePtr_).optimizeSurface(); + + # ifdef DEBUG + mesh_.write(); + # ifdef DEBUGfpma + writeMeshFPMA(mesh_, "optSurfaceWithEdges"); + # else + writeMeshEnsight(mesh_, "optSurfaceWithEdges"); + #endif + //::exit(EXIT_FAILURE); + # endif } - + void cartesianMeshGenerator::generateBoudaryLayers() { - boundaryLayers bl(mesh_); + boundaryLayers bl(mesh_); if( meshDict_.found("boundaryLayers") ) { @@ -224,37 +224,37 @@ void cartesianMeshGenerator::generateBoudaryLayers() { //bl.createOTopologyLayers(); bl.addLayerForAllPatches(); - } + } - # ifdef DEBUG + # ifdef DEBUG # ifdef DEBUGfpma writeMeshFPMA(mesh_, "meshWithBndLayer"); # else - writeMeshEnsight(mesh_, "meshWithBndLayer"); + writeMeshEnsight(mesh_, "meshWithBndLayer"); + # endif + mesh_.write(); + //::exit(EXIT_FAILURE); # endif - mesh_.write(); - //::exit(EXIT_FAILURE); - # endif } - + void cartesianMeshGenerator::optimiseFinalMesh() { - //- final optimisation - meshOptimizer optimizer(mesh_); + //- final optimisation + meshOptimizer optimizer(mesh_); optimizer.optimizeSurface(*octreePtr_); deleteDemandDrivenData(octreePtr_); optimizer.optimizeMeshFV(); - - # ifdef DEBUG - # ifdef DEBUGfpma - writeMeshFPMA(mesh_,"optimisedMesh"); - # else - writeMeshEnsight(mesh_, "optimisedMesh"); - #endif - # endif + + # ifdef DEBUG + # ifdef DEBUGfpma + writeMeshFPMA(mesh_,"optimisedMesh"); + # else + writeMeshEnsight(mesh_, "optimisedMesh"); + #endif + # endif } void cartesianMeshGenerator::replaceBoundaries() @@ -262,44 +262,44 @@ void cartesianMeshGenerator::replaceBoundaries() renameBoundaryPatches rbp(mesh_, meshDict_); # ifdef DEBUG - # ifdef DEBUGfpma - writeMeshFPMA(mesh_,"renamedPatchesMesh"); - # else - writeMeshEnsight(mesh_, "renamedPatchesMesh"); - #endif - # endif + # ifdef DEBUGfpma + writeMeshFPMA(mesh_,"renamedPatchesMesh"); + # else + writeMeshEnsight(mesh_, "renamedPatchesMesh"); + #endif + # endif } void cartesianMeshGenerator::renumberMesh() { - polyMeshGenModifier(mesh_).renumberMesh(); - - # ifdef DEBUG - # ifdef DEBUGfpma - writeMeshFPMA(mesh_,"renumberedMesh"); - # else - writeMeshEnsight(mesh_, "renumberedMesh"); - #endif - # endif + polyMeshGenModifier(mesh_).renumberMesh(); + + # ifdef DEBUG + # ifdef DEBUGfpma + writeMeshFPMA(mesh_,"renumberedMesh"); + # else + writeMeshEnsight(mesh_, "renumberedMesh"); + #endif + # endif } - + void cartesianMeshGenerator::generateMesh() { - createCartesianMesh(); - - surfacePreparation(); - - mapMeshToSurface(); - - mapEdgesAndCorners(); - - optimiseMeshSurface(); - - generateBoudaryLayers(); - - optimiseFinalMesh(); - - renumberMesh(); + createCartesianMesh(); + + surfacePreparation(); + + mapMeshToSurface(); + + mapEdgesAndCorners(); + + optimiseMeshSurface(); + + generateBoudaryLayers(); + + optimiseFinalMesh(); + + renumberMesh(); replaceBoundaries(); } @@ -323,7 +323,7 @@ cartesianMeshGenerator::cartesianMeshGenerator(const Time& time) ) ), octreePtr_(NULL), - mesh_(time) + mesh_(time) { if( true ) { @@ -332,21 +332,21 @@ cartesianMeshGenerator::cartesianMeshGenerator(const Time& time) fileName surfaceFile = meshDict_.lookup("surfaceFile"); if( Pstream::parRun() ) - surfaceFile = ".."/surfaceFile; + surfaceFile = ".."/surfaceFile; surfacePtr_ = new triSurf(db_.path()/surfaceFile); - - if( meshDict_.found("subsetFileName") ) - { - fileName subsetFileName = meshDict_.lookup("subsetFileName"); + + if( meshDict_.found("subsetFileName") ) + { + fileName subsetFileName = meshDict_.lookup("subsetFileName"); if( Pstream::parRun() ) - subsetFileName = ".."/subsetFileName; - surfacePtr_->readFaceSubsets(db_.path()/subsetFileName); - } + subsetFileName = ".."/subsetFileName; + surfacePtr_->readFaceSubsets(db_.path()/subsetFileName); + } octreePtr_ = new meshOctree(*surfacePtr_); - - meshOctreeCreator(*octreePtr_, meshDict_).createOctreeBoxes(); + + meshOctreeCreator(*octreePtr_, meshDict_).createOctreeBoxes(); generateMesh(); } @@ -372,7 +372,7 @@ cartesianMeshGenerator::cartesianMeshGenerator ) ), octreePtr_(NULL), - mesh_(time) + mesh_(time) { fileName surfaceFile = meshDict_.lookup("surfaceFile"); @@ -395,8 +395,8 @@ cartesianMeshGenerator::~cartesianMeshGenerator() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // void cartesianMeshGenerator::writeMesh() const -{ - mesh_.write(); +{ + mesh_.write(); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.H b/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.H index b308812..702c68a 100644 --- a/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.H +++ b/meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.H @@ -68,38 +68,38 @@ class cartesianMeshGenerator //- pointer to the octree meshOctree* octreePtr_; - - //- mesh - polyMeshGen mesh_; + + //- mesh + polyMeshGen mesh_; // Private member functions - //- create cartesian mesh - void createCartesianMesh(); - - //- prepare mesh surface - void surfacePreparation(); - - //- map mesh to the surface and untangle surface - void mapMeshToSurface(); - - //- capture edges and corners - void mapEdgesAndCorners(); - - //- optimise surface mesh - void optimiseMeshSurface(); - - //- add boundary layers - void generateBoudaryLayers(); - - //- mesh optimisation - void optimiseFinalMesh(); + //- create cartesian mesh + void createCartesianMesh(); + + //- prepare mesh surface + void surfacePreparation(); + + //- map mesh to the surface and untangle surface + void mapMeshToSurface(); + + //- capture edges and corners + void mapEdgesAndCorners(); + + //- optimise surface mesh + void optimiseMeshSurface(); + + //- add boundary layers + void generateBoudaryLayers(); + + //- mesh optimisation + void optimiseFinalMesh(); //- replace boundaries void replaceBoundaries(); - - //- renumber the mesh - void renumberMesh(); - + + //- renumber the mesh + void renumberMesh(); + //- generate mesh void generateMesh(); diff --git a/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractor.C b/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractor.C index 7ae358c..5cdd7b2 100644 --- a/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractor.C +++ b/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractor.C @@ -39,18 +39,18 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // const direction dualMeshExtractor::faceFlip_[6][4] = - { - {0, 4, 6, 2}, - {5, 1, 3, 7}, - {0, 2, 3, 1}, - {4, 5, 7, 6}, - {2, 6, 7, 3}, - {0, 1, 5, 4} - }; - + { + {0, 4, 6, 2}, + {5, 1, 3, 7}, + {0, 2, 3, 1}, + {4, 5, 7, 6}, + {2, 6, 7, 3}, + {0, 1, 5, 4} + }; + void dualMeshExtractor::clearOut() { - deleteDemandDrivenData(centreNodeLabelPtr_); + deleteDemandDrivenData(centreNodeLabelPtr_); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -59,13 +59,13 @@ void dualMeshExtractor::clearOut() dualMeshExtractor::dualMeshExtractor ( const meshOctree& octree, - const IOdictionary& dict, - polyMeshGen& mesh + const IOdictionary& dict, + polyMeshGen& mesh ) : octreeAddressing_(octree, dict, true), - mesh_(mesh), - centreNodeLabelPtr_(NULL) + mesh_(mesh), + centreNodeLabelPtr_(NULL) { } @@ -73,33 +73,33 @@ dualMeshExtractor::dualMeshExtractor dualMeshExtractor::~dualMeshExtractor() { - clearOut(); + clearOut(); } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // void dualMeshExtractor::createMesh() { - Info << "Extracting polyMesh" << endl; - + Info << "Extracting polyMesh" << endl; + createPoints(); createPolyMesh(); - - polyMeshGenModifier(mesh_).removeUnusedVertices(); - polyMeshGenModifier(mesh_).reorderBoundaryFaces(); - - Info << "Mesh has :" << nl - << mesh_.points().size() << " vertices " << nl - << mesh_.faces().size() << " faces" << nl - << mesh_.cells().size() << " cells" << endl; - - # ifdef DEBUGDual - Info << "Points start at address " << long(&mesh_.points()) << endl; - Info << "Faces start at address " << long(&mesh_.faces()) << endl; - Info << "Cells start at address " << long(&mesh_.cells()) << endl; - # endif - + + polyMeshGenModifier(mesh_).removeUnusedVertices(); + polyMeshGenModifier(mesh_).reorderBoundaryFaces(); + + Info << "Mesh has :" << nl + << mesh_.points().size() << " vertices " << nl + << mesh_.faces().size() << " faces" << nl + << mesh_.cells().size() << " cells" << endl; + + # ifdef DEBUGDual + Info << "Points start at address " << long(&mesh_.points()) << endl; + Info << "Faces start at address " << long(&mesh_.faces()) << endl; + Info << "Cells start at address " << long(&mesh_.cells()) << endl; + # endif + Info << "Finished extracting polyMesh" << endl; } diff --git a/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractor.H b/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractor.H index 5e7a08b..fb64ec5 100644 --- a/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractor.H +++ b/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractor.H @@ -56,82 +56,82 @@ class meshOctree; class dualMeshExtractor { // Private data - //- helper for cell creation - static const direction faceFlip_[6][4]; + //- helper for cell creation + static const direction faceFlip_[6][4]; //- reference to the octree meshOctreeAddressing octreeAddressing_; - - //- reference to the mesh - polyMeshGen& mesh_; - - //- centre node labels - labelListPMG* centreNodeLabelPtr_; + + //- reference to the mesh + polyMeshGen& mesh_; + + //- centre node labels + labelListPMG* centreNodeLabelPtr_; // Private member functions - //- delete freestore data - void clearOut(); - + //- delete freestore data + void clearOut(); + //- create vertices and pointLeaves addressing void createPoints(); //- create mesh data void createPolyMesh(); - - // Nested classes - class decomposeCreatedPoly - { - // Private data - const faceList& cellFaces_; - - const Map& nodeLevel_; - - boolListList splitFaceNode_; - - //- list of edges over which a face has been split - DynList splitEdge_; - - //- list containing information if a face - //- is a product of splitting - DynList splitFace_; - - //- a list of decomposed faces - DynList decomposedFaces_; - - //- helper data - labelListList dfe_; - labelListList def_; - DynList de_; - boolList se_; - - // Private member functions - //- decompose non-planar faces into triangles - void decomposeFaces(); - - //- calculate helper data - void calculateHelperAddressing(); - - //- find additional splitting edges - void selectAdditionalSplitEdges(); - - //- distribute new faces into cells - void selectFacesForCell(List& cFaces); - - //- create missing faces to topologically close new cells - void createMissingFaces(List& cFaces); - - public: - - decomposeCreatedPoly - ( - const faceList& cf, - const Map& nl - ); - - ~decomposeCreatedPoly(); - - void decomposeCell(List& decCells); - }; + + // Nested classes + class decomposeCreatedPoly + { + // Private data + const faceList& cellFaces_; + + const Map& nodeLevel_; + + boolListList splitFaceNode_; + + //- list of edges over which a face has been split + DynList splitEdge_; + + //- list containing information if a face + //- is a product of splitting + DynList splitFace_; + + //- a list of decomposed faces + DynList decomposedFaces_; + + //- helper data + labelListList dfe_; + labelListList def_; + DynList de_; + boolList se_; + + // Private member functions + //- decompose non-planar faces into triangles + void decomposeFaces(); + + //- calculate helper data + void calculateHelperAddressing(); + + //- find additional splitting edges + void selectAdditionalSplitEdges(); + + //- distribute new faces into cells + void selectFacesForCell(List& cFaces); + + //- create missing faces to topologically close new cells + void createMissingFaces(List& cFaces); + + public: + + decomposeCreatedPoly + ( + const faceList& cf, + const Map& nl + ); + + ~decomposeCreatedPoly(); + + void decomposeCell(List& decCells); + }; // Private copy constructor //- Disallow default bitwise copy construct @@ -148,8 +148,8 @@ public: dualMeshExtractor ( const meshOctree& octree, - const IOdictionary& dict, - polyMeshGen& mesh + const IOdictionary& dict, + polyMeshGen& mesh ); // Destructor @@ -159,7 +159,7 @@ public: // Member Functions - void createMesh(); + void createMesh(); }; diff --git a/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractorDecompose.C b/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractorDecompose.C index 020a407..374f2b0 100644 --- a/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractorDecompose.C +++ b/meshLibrary/dualMesh/dualMeshExtractor/dualMeshExtractorDecompose.C @@ -36,544 +36,544 @@ Description namespace Foam { - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // void dualMeshExtractor::decomposeCreatedPoly::decomposeFaces() { - //- check if face needs to be decomposed - forAll(cellFaces_, cfI) - { - const face& f = cellFaces_[cfI]; - - if( f.size() == 3 ) - { - decomposedFaces_.append(f); - splitFace_.append(false); - } - else - { - List nodeLevel(4); - forAll(f, pI) - nodeLevel[pI] = nodeLevel_.find(f[pI])(); - - # ifdef DEBUGDual - forAll(nodeLevel, nI) - Info << "level for node " << f[nI] << " is " - << label(nodeLevel[nI]) << endl; - # endif - - direction minLevel(nodeLevel[0]); - forAll(nodeLevel, nI) - if( minLevel > nodeLevel[nI] ) - minLevel = nodeLevel[nI]; - - //- find positions of min level nodes - DynList posMin(4); - forAll(nodeLevel, nI) - if( nodeLevel[nI] == minLevel ) - posMin.append(nI); - - switch( posMin.size() ) - { - case 4: - { - //- store face - decomposedFaces_.append(f); - splitFace_.append(false); - } break; - case 3: - { - # ifdef DEBUGDual - Info << "2. Decomposing " << f << endl; - # endif - //- decompose face into 2 triangles - direction posHigh(0); - forAll(nodeLevel, nI) - if( nodeLevel[nI] != minLevel ) - { - posHigh = nI; - break; - } - - splitEdge_.append - ( - edge(f[posHigh], f[(posHigh+2)%4]) - ); - splitFaceNode_[cfI][posHigh] = true; - splitFaceNode_[cfI][(posHigh+2)%4] = true; - - face tri(3); - tri[0] = f[posHigh]; - tri[1] = f[f.fcIndex(posHigh)]; - tri[2] = f[(posHigh+2)%4]; - # ifdef DEBUGDual - Info << "2. tri " << tri << endl; - # endif - decomposedFaces_.append(tri); - splitFace_.append(true); - - tri[0] = f[posHigh]; - tri[1] = f[(posHigh+2)%4]; - tri[2] = f[f.rcIndex(posHigh)]; - # ifdef DEBUGDual - Info << "2. tri " << tri << endl; - # endif - decomposedFaces_.append(tri); - splitFace_.append(true); - } break; - case 2: - { - if( - (f.fcIndex(posMin[0]) == posMin[1]) - || (f.rcIndex(posMin[0]) == posMin[1]) - ) - { - decomposedFaces_.append(f); - splitFace_.append(false); - } - else - { - # ifdef DEBUGDual - Info << "3. Decomposing " << f << endl; - # endif - face tri(3); - direction pm = posMin[0]; - - splitEdge_.append - ( - edge(f[f.fcIndex(pm)], f[f.rcIndex(pm)]) - ); - splitFaceNode_[cfI][f.fcIndex(pm)] = true; - splitFaceNode_[cfI][f.rcIndex(pm)] = true; - - tri[0] = f[pm]; - tri[1] = f[f.fcIndex(pm)]; - tri[2] = f[f.rcIndex(pm)]; - # ifdef DEBUGDual - Info << "3. tri " << tri << endl; - # endif - decomposedFaces_.append(tri); - splitFace_.append(true); - - pm = posMin[1]; - tri[0] = f[pm]; - tri[1] = f[f.fcIndex(pm)]; - tri[2] = f[f.rcIndex(pm)]; - # ifdef DEBUGDual - Info << "3. tri " << tri << endl; - # endif - decomposedFaces_.append(tri); - splitFace_.append(true); - } - } break; - case 1: - { - # ifdef DEBUGDual - Info << "4. Decomposing " << f << endl; - # endif - //- decompose face into 2 triangles - const direction pm = posMin[0]; - - splitEdge_.append - ( - edge(f[f.fcIndex(pm)], f[f.rcIndex(pm)]) - ); - splitFaceNode_[cfI][f.fcIndex(pm)] = true; - splitFaceNode_[cfI][f.rcIndex(pm)] = true; - - face tri(3); - tri[0] = f[pm]; - tri[1] = f[f.fcIndex(pm)]; - tri[2] = f[f.rcIndex(pm)]; - # ifdef DEBUGDual - Info << "4. tri " << tri << endl; - # endif - decomposedFaces_.append(tri); - splitFace_.append(true); - - tri[0] = f[f.fcIndex(pm)]; - tri[1] = f[(pm+2)%4]; - tri[2] = f[f.rcIndex(pm)]; - # ifdef DEBUGDual - Info << "4. tri " << tri << endl; - # endif - decomposedFaces_.append(tri); - splitFace_.append(true); - } break; - }; - } - } + //- check if face needs to be decomposed + forAll(cellFaces_, cfI) + { + const face& f = cellFaces_[cfI]; + + if( f.size() == 3 ) + { + decomposedFaces_.append(f); + splitFace_.append(false); + } + else + { + List nodeLevel(4); + forAll(f, pI) + nodeLevel[pI] = nodeLevel_.find(f[pI])(); + + # ifdef DEBUGDual + forAll(nodeLevel, nI) + Info << "level for node " << f[nI] << " is " + << label(nodeLevel[nI]) << endl; + # endif + + direction minLevel(nodeLevel[0]); + forAll(nodeLevel, nI) + if( minLevel > nodeLevel[nI] ) + minLevel = nodeLevel[nI]; + + //- find positions of min level nodes + DynList posMin(4); + forAll(nodeLevel, nI) + if( nodeLevel[nI] == minLevel ) + posMin.append(nI); + + switch( posMin.size() ) + { + case 4: + { + //- store face + decomposedFaces_.append(f); + splitFace_.append(false); + } break; + case 3: + { + # ifdef DEBUGDual + Info << "2. Decomposing " << f << endl; + # endif + //- decompose face into 2 triangles + direction posHigh(0); + forAll(nodeLevel, nI) + if( nodeLevel[nI] != minLevel ) + { + posHigh = nI; + break; + } + + splitEdge_.append + ( + edge(f[posHigh], f[(posHigh+2)%4]) + ); + splitFaceNode_[cfI][posHigh] = true; + splitFaceNode_[cfI][(posHigh+2)%4] = true; + + face tri(3); + tri[0] = f[posHigh]; + tri[1] = f[f.fcIndex(posHigh)]; + tri[2] = f[(posHigh+2)%4]; + # ifdef DEBUGDual + Info << "2. tri " << tri << endl; + # endif + decomposedFaces_.append(tri); + splitFace_.append(true); + + tri[0] = f[posHigh]; + tri[1] = f[(posHigh+2)%4]; + tri[2] = f[f.rcIndex(posHigh)]; + # ifdef DEBUGDual + Info << "2. tri " << tri << endl; + # endif + decomposedFaces_.append(tri); + splitFace_.append(true); + } break; + case 2: + { + if( + (f.fcIndex(posMin[0]) == posMin[1]) + || (f.rcIndex(posMin[0]) == posMin[1]) + ) + { + decomposedFaces_.append(f); + splitFace_.append(false); + } + else + { + # ifdef DEBUGDual + Info << "3. Decomposing " << f << endl; + # endif + face tri(3); + direction pm = posMin[0]; + + splitEdge_.append + ( + edge(f[f.fcIndex(pm)], f[f.rcIndex(pm)]) + ); + splitFaceNode_[cfI][f.fcIndex(pm)] = true; + splitFaceNode_[cfI][f.rcIndex(pm)] = true; + + tri[0] = f[pm]; + tri[1] = f[f.fcIndex(pm)]; + tri[2] = f[f.rcIndex(pm)]; + # ifdef DEBUGDual + Info << "3. tri " << tri << endl; + # endif + decomposedFaces_.append(tri); + splitFace_.append(true); + + pm = posMin[1]; + tri[0] = f[pm]; + tri[1] = f[f.fcIndex(pm)]; + tri[2] = f[f.rcIndex(pm)]; + # ifdef DEBUGDual + Info << "3. tri " << tri << endl; + # endif + decomposedFaces_.append(tri); + splitFace_.append(true); + } + } break; + case 1: + { + # ifdef DEBUGDual + Info << "4. Decomposing " << f << endl; + # endif + //- decompose face into 2 triangles + const direction pm = posMin[0]; + + splitEdge_.append + ( + edge(f[f.fcIndex(pm)], f[f.rcIndex(pm)]) + ); + splitFaceNode_[cfI][f.fcIndex(pm)] = true; + splitFaceNode_[cfI][f.rcIndex(pm)] = true; + + face tri(3); + tri[0] = f[pm]; + tri[1] = f[f.fcIndex(pm)]; + tri[2] = f[f.rcIndex(pm)]; + # ifdef DEBUGDual + Info << "4. tri " << tri << endl; + # endif + decomposedFaces_.append(tri); + splitFace_.append(true); + + tri[0] = f[f.fcIndex(pm)]; + tri[1] = f[(pm+2)%4]; + tri[2] = f[f.rcIndex(pm)]; + # ifdef DEBUGDual + Info << "4. tri " << tri << endl; + # endif + decomposedFaces_.append(tri); + splitFace_.append(true); + } break; + }; + } + } } void dualMeshExtractor::decomposeCreatedPoly::calculateHelperAddressing() { - dfe_.setSize(decomposedFaces_.size()); - forAll(decomposedFaces_, faceI) - { - dfe_[faceI].setSize(decomposedFaces_[faceI].size()); - dfe_[faceI] = -1; - } - - direction edgeI(0); - forAll(decomposedFaces_, faceI) - { - const edgeList edg = decomposedFaces_[faceI].edges(); - forAll(edg, eI) - { - const label pos = de_.containsAtPosition(edg[eI]); - - if( pos == -1 ) - { - de_.append(edg[eI]); - dfe_[faceI][eI] = edgeI; - def_[edgeI][0] = faceI; - ++edgeI; - } - else - { - dfe_[faceI][eI] = pos; - def_[pos][1] = faceI; - } - } - } - - se_.setSize(edgeI); - se_ = false; - - forAll(de_, eI) - if( splitEdge_.contains(de_[eI]) ) - se_[eI] = true; - - # ifdef DEBUGDual - Info << "de_ " << de_ << endl; - Info << "def_ " << def_ << endl; - Info << "dfe_ " << dfe_ << endl; - Info << "se " << se_ << endl; - # endif + dfe_.setSize(decomposedFaces_.size()); + forAll(decomposedFaces_, faceI) + { + dfe_[faceI].setSize(decomposedFaces_[faceI].size()); + dfe_[faceI] = -1; + } + + direction edgeI(0); + forAll(decomposedFaces_, faceI) + { + const edgeList edg = decomposedFaces_[faceI].edges(); + forAll(edg, eI) + { + const label pos = de_.containsAtPosition(edg[eI]); + + if( pos == -1 ) + { + de_.append(edg[eI]); + dfe_[faceI][eI] = edgeI; + def_[edgeI][0] = faceI; + ++edgeI; + } + else + { + dfe_[faceI][eI] = pos; + def_[pos][1] = faceI; + } + } + } + + se_.setSize(edgeI); + se_ = false; + + forAll(de_, eI) + if( splitEdge_.contains(de_[eI]) ) + se_[eI] = true; + + # ifdef DEBUGDual + Info << "de_ " << de_ << endl; + Info << "def_ " << def_ << endl; + Info << "dfe_ " << dfe_ << endl; + Info << "se " << se_ << endl; + # endif } void dualMeshExtractor::decomposeCreatedPoly::selectAdditionalSplitEdges() { - DynList