ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

occ as shared lib

Browse Source
This commit is contained in:
Joachim Schoeberl 2011-01-14 17:03:35 +00:00
parent f31ac31e1d
commit 1b4c7be876
8 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/occ/Makefile.am
View File

@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(OCCFLAGS) $(TCL_INCLUDES)
METASOURCES = AUTO METASOURCES = AUTO
noinst_LTLIBRARIES = libocc.la liboccvis.la lib_LTLIBRARIES = libocc.la liboccvis.la
libocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ libocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \
Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \ Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \

4
libsrc/occ/occpkg.cpp
View File

@ -15,7 +15,7 @@
#include "vsocc.hpp" #include "vsocc.hpp"
extern "C" int Ng_OCC_Init (Tcl_Interp * interp); extern "C" int Ng_occ_Init (Tcl_Interp * interp);
@ -958,7 +958,7 @@ namespace netgen
using namespace netgen; using namespace netgen;
int Ng_OCC_Init (Tcl_Interp * interp) int Ng_occ_Init (Tcl_Interp * interp)
{ {
geometryregister.Append (new OCCGeometryRegister); geometryregister.Append (new OCCGeometryRegister);

5
ng/csgeom.tcl
View File

@ -16,11 +16,6 @@
.ngmenu.geometry add command -label "CSG Properties..." \ .ngmenu.geometry add command -label "CSG Properties..." \
-command topleveldialog2 -command topleveldialog2
.ngmenu.geometry add separator

4
ng/menustat.tcl
View File

@ -62,7 +62,9 @@ menu .ngmenu.file
set dirname [file dirname $file] set dirname [file dirname $file]
set basefilename [file tail [file rootname $file]] set basefilename [file tail [file rootname $file]]
rebuildoccdialog if { $hasocc == "yes" } {
rebuildoccdialog
}
} }
} }

13
ng/ng.tcl
View File

@ -12,6 +12,8 @@ if {[catch {package require Tix } result ]} {
# userlevel 1..standard user 2..power-user 3..developer # userlevel 1..standard user 2..power-user 3..developer
set userlevel 3 set userlevel 3
@ -84,7 +86,10 @@ catch {
source ${ngdir}/csgeom.tcl source ${ngdir}/csgeom.tcl
source ${ngdir}/stlgeom.tcl source ${ngdir}/stlgeom.tcl
source ${ngdir}/occgeom.tcl
set hasocc no
catch { source ${ngdir}/occgeom.tcl }
source ${ngdir}/acisgeom.tcl source ${ngdir}/acisgeom.tcl
@ -107,7 +112,7 @@ catch {
set zugstange 0 set zugstange 0
catch { source ${ngdir}/trafo/menu.tcl } catch { source ${ngdir}/trafo/menu.tcl }
@ -118,10 +123,12 @@ Ng_SetVisParameters
Ng_SetDebugParameters Ng_SetDebugParameters
Ng_STLDoctor Ng_STLDoctor
Ng_GeometryOptions set Ng_GeometryOptions set
catch {
if { $hasocc == "yes" } {
Ng_SetOCCVisParameters Ng_SetOCCVisParameters
} }
if { $batchmode != "defined" } { if { $batchmode != "defined" } {
catch { catch {
wm protocol . WM_DELETE_WINDOW { .ngmenu.file invoke "Quit" } wm protocol . WM_DELETE_WINDOW { .ngmenu.file invoke "Quit" }

10
ng/ngpkg.cpp
View File

@ -3074,7 +3074,11 @@ namespace netgen
extern "C" int Ng_Init (Tcl_Interp * interp); extern "C" int Ng_Init (Tcl_Interp * interp);
extern "C" int Ng_CSG_Init (Tcl_Interp * interp); extern "C" int Ng_CSG_Init (Tcl_Interp * interp);
extern "C" int Ng_STL_Init (Tcl_Interp * interp); extern "C" int Ng_STL_Init (Tcl_Interp * interp);
extern "C" int Ng_OCC_Init (Tcl_Interp * interp);
#ifdef OCCGEOMETRY
// extern "C" int Ng_occ_Init (Tcl_Interp * interp);
#endif
extern "C" int Ng_Geom2d_Init (Tcl_Interp * interp); extern "C" int Ng_Geom2d_Init (Tcl_Interp * interp);
// int main_Eero (ClientData clientData, // int main_Eero (ClientData clientData,
@ -3091,9 +3095,11 @@ namespace netgen
Ng_CSG_Init(interp); Ng_CSG_Init(interp);
Ng_STL_Init(interp); Ng_STL_Init(interp);
#ifdef OCCGEOMETRY #ifdef OCCGEOMETRY
Ng_OCC_Init(interp); // Ng_occ_Init(interp);
#endif #endif
Ng_Geom2d_Init(interp); Ng_Geom2d_Init(interp);
tcl_interp = interp; tcl_interp = interp;

12
ng/occgeom.tcl
View File

@ -1,8 +1,18 @@
if { [catch { load liboccvis[info sharedlibextension] Ng_OCC } result ] } {
# puts "cannot load occ"
# puts "error: $result"
} {
puts "OCC module loaded"
set hasocc yes
}
.ngmenu.geometry add separator
.ngmenu.geometry add command -label "IGES/STEP Topology Explorer/Doctor..." \ .ngmenu.geometry add command -label "IGES/STEP Topology Explorer/Doctor..." \
-command { occdialog; } -command { occdialog; }
# Philippose - 30/01/2009 # Philippose - 30/01/2009
# Add menu item for local face mesh size definition in the # Add menu item for local face mesh size definition in the
# TCL Gui # TCL Gui

3
ng/stlgeom.tcl
View File

@ -1,3 +1,5 @@
.ngmenu.geometry add separator
.ngmenu.geometry add command -label "STL Doctor..." \ .ngmenu.geometry add command -label "STL Doctor..." \
-command { stldoctordialog; } -command { stldoctordialog; }
@ -17,4 +19,3 @@
tk_messageBox -title "STL Info" -message $msgtext -type ok tk_messageBox -title "STL Info" -message $msgtext -type ok
} }
.ngmenu.geometry add separator