Commit Graph

368 Commits

Author SHA1 Message Date
Unknown
afdc1ae85a Misc. typos
More typo
2017-12-09 22:21:40 -05:00
Matthias Hochsteger
0b1d4e3658 Use gl headers on windows 2017-11-13 02:38:13 -08:00
luzpaz
9d56646677 More typos 2017-11-10 13:10:34 -05:00
Matthias Hochsteger
c55ad18a73 Fix build/image export with USE_JPEG=ON
- fixes broken build with USE_JPEG
 - cleanes up the screenshot code itself (there were problems with memory
   alignment, now enforce alignment of 1 byte)
 - proper error message if 'convert' is not working
 - append '.ppm' to file for temporary filename instead of replacing last
   three characters
2017-09-22 11:26:10 +02:00
Matthias Hochsteger
042db258c8 Fix build with GUI=ON, MPI=ON 2017-09-21 17:58:38 +02:00
Matthias Hochsteger
341f0bd753 Update onetcl.cpp 2017-09-14 15:54:12 +02:00
Matthias Hochsteger
e50104fa40 Fix TKDND on Windows 2017-09-14 15:34:41 +02:00
Joachim Schöberl
e17939a95b Merge branch 'update_pybind11' into 'master'
Update pybind11 to version 2.2.0

See merge request !60
2017-09-02 22:09:34 +02:00
Matthias Hochsteger
1430b89e39 Update pybind11 to version 2.2.0
- Replace PYBIND11_PLUGIN with PYBIND11_MODULE

- Fix warnings about symbol visibility by replacing
  'namespace pybind11' with 'namespace PYBIND11_NAMESPACE'

- Pybind sets the default visibility of its namespace to 'hidden'
  Thus, our export functions like  ExportCSG(py::module &m) also are
  hidden by default. To work around that define DLL_HEADER
  '__attribute__ ((visibility ("default")))
  on GNUC platforms.
2017-09-01 10:16:56 +02:00
Joachim Schöberl
7e83edabf1 order of d'tors for global variables: create VSSolution on demand, which is later 2017-08-28 18:19:20 +02:00
luzpaz
cea3f3e2b9 Misc. typo fixes 2017-07-25 23:29:41 -04:00
Joachim Schöberl
043e3403ba use geometry from mesh on export user format 2017-07-24 22:26:18 +02:00
Joachim Schöberl
046f473619 Merge branch 'master' of data.asc.tuwien.ac.at:jschoeberl/netgen 2017-07-24 21:49:59 +02:00
Joachim Schöberl
8377ab058d switch off creation of hexes per default 2017-07-24 21:49:49 +02:00
Gerhard Kitzler
fe21f0aff1 Fix FFMPEG for Windows 2017-06-30 09:31:18 +02:00
Matthias Hochsteger
24a67bcf88 CMake: work around strange install behavior 2017-06-08 16:49:17 +02:00
Matthias Hochsteger
0fc20f3aee CMake fix 2017-06-08 15:26:35 +02:00
Matthias Hochsteger
2e5b7082ea CMake: again fix 2017-06-08 15:21:32 +02:00
Matthias Hochsteger
22874f8bf5 CMake: fix install components 2017-06-08 15:15:20 +02:00
Matthias Hochsteger
c2c16d6b03 CMake: fix missing components 2017-06-08 14:48:13 +02:00
Matthias Hochsteger
e68333ee00 Search for ngsolve.tcl in PATH (after NETGENDIR) 2017-06-01 17:28:11 +02:00
Matthias Hochsteger
c9ac332971 Export OCC module only when configured with OCC 2017-05-31 19:57:42 +02:00
Matthias Hochsteger
0c611c339c Python opencascade interface (by Gerhard Kitzler) 2017-05-31 19:39:09 +02:00
Matthias Hochsteger
f6a0b31b96 Cleanup CMake build system
- Use CMAKE_INSTALL_PREFIX instead of INSTALL_DIR
  - Allow finer control of install directories
  - Use compiled TCL code by default
  - Fix RPATH usage on Linux and MacOSX

### Allow finer control of install directories
The following variables can be set to either absolute or relative paths
NG_INSTALL_DIR_PYTHON: Python files
NG_INSTALL_DIR_BIN: Executables
NG_INSTALL_DIR_LIB: Libraries
NG_INSTALL_DIR_INCLUDE: header files
NG_INSTALL_DIR_CMAKE: CMake files
NG_INSTALL_DIR_RES: Resources

### Use compiled TCL code by default
The tcl files contained in Netgen are stored in onetcl.cpp as c-string.
This way it's not necessary to install tcl files or set NETGENDIR

### Fix RPATH usage on Linux and MacOSX
The Netgen installation should be completely relocatable now.

Squashed commit of the following:

commit 201eda5e62726bd87d76beb13c3e5643cd4c7810
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 21:10:08 2017 +0200

    cleanup

commit b4cd46a9d2f390b40c5223c8d9971f576b979644
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 20:47:46 2017 +0200

    fix

commit 6506a834dbee2fd7b6df3b3f3709d0b27344356f
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 20:41:45 2017 +0200

    allow gui test to fail

commit 56c5fc131f61259e6fb67b60f7fff955d2e8d2da
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 20:26:18 2017 +0200

    add python3-tk to docker images

commit 4d1b5aac1d028867339819599708a08f2098bbd6
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 11:22:18 2017 -0700

    windows fix

commit 92b5f8a95491ba3508143d7f1b94359edc0655ce
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 11:08:08 2017 -0700

    fix for windows

commit 3f7bf51434ef3b637b3563930ddb61d04af645cb
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 19:28:13 2017 +0200

    fixes, test for gui

commit ef1d0164a50fadf374e3b1e43a745b5f69a16ad6
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 19:06:55 2017 +0200

    fixes

commit 67645bb896012149c23c851b03287199c21fa129
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 17:24:58 2017 +0200

    netgen config

commit b587b77a282768719cffc366c56d82a1746e0be0
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 16:53:47 2017 +0200

    remove comments

commit 2b34cc78818afa1cf21484bd0976413a91db0851
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 05:03:00 2017 -0700

    fix windows

commit 9e98efa54065624e264eaf1acf74b44ef022a68d
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 13:42:11 2017 +0200

    fixes

commit 394b470a07d73431079f80caa36c7c7042077f40
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 12:24:40 2017 +0200

    fix rpath issue

commit 6787eae384a8592f90598258ccd8207cd499d9fc
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 11:37:05 2017 +0200

    some more fixes with install dir

commit fcf22659c60300e8d39d12e14b21c58a062e739c
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 01:34:06 2017 -0700

    some fixes

commit ede1f0c462978bb70d3b4e2251cb555a592e82e3
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 29 10:16:34 2017 +0200

    fixes

commit b6a1259876a77f54e419a44f1b44d03d5bb49b82
Merge: c79f9a3 6627b0b
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 24 09:35:50 2017 +0200

    Merge remote-tracking branch 'origin/master' into cmake_cleanup

commit c79f9a3421d4d2937c31dab4a601ce09d52b0e54
Merge: 99c3550 030ad1d
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 22 17:52:24 2017 +0200

    Merge remote-tracking branch 'origin/master' into cmake_cleanup

commit 99c35500850e08fdc847013bb384169b1483acb4
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Fri May 19 14:37:28 2017 +0200

    fix rpath

commit 8215e9748d9ee225266bc941da1ca252aebd27de
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Thu May 18 13:29:41 2017 +0200

    remove INSTALL_DIR, rename var to NETGEN_INSTALL_DIR_INCLUDE, install libngpy to python package folder

commit 23d028c4cf7572de9e2e277cda8f6b07b6b1d9f9
Merge: 57027c8 f72a247
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Thu May 18 12:03:59 2017 +0200

    Merge remote-tracking branch 'origin/master' into cmake_cleanup

commit 57027c8c706ff755bdf26887884bbdeca129fe8f
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Fri May 12 17:32:05 2017 +0200

    New CMake option: USE_INTERNAL_TCL (ON by default)

    This option uses the tcl code compiled in onetcl.cpp instead of separate
    tcl files by default. When set at configure time, no tcl files will be
    installed anymore.

commit 27ce5b7edd66d64e2453f5045f5ac08c313f7608
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Fri May 12 17:16:52 2017 +0200

    WIP: Cleanup of CMake files

      - Fix RPATH on Linux (TODO: other platforms)
      - New variables to specify install behaviour:
          NG_INSTALL_DIR_BIN
          NG_INSTALL_DIR_LIB
          NG_INSTALL_DIR_CMAKE
          NG_INSTALL_DIR_INCLUDE
2017-05-29 21:41:27 +02:00
Matthias Hochsteger
030ad1d732 Update screenshot code for Togl 2 2017-05-22 17:24:17 +02:00
Matthias Hochsteger
e1d7cd879d Don't link TCL/TK to gui lib on MacOS
In case there are multiple versions of tcl/tk available on MacOS, the
system complains about it if we link against one version and
python/tkinter links against another.
Thus don't link with any tcl at all in the gui library. This means the
library will use the version loaded by tkinter.
2017-05-12 13:10:10 +02:00
Matthias Hochsteger
4a331a8a38 Stop TCL timer when GUI quits 2017-05-11 11:50:50 +02:00
Matthias Hochsteger
3eef3a66bc link TCL to gui library 2017-05-11 11:21:55 +02:00
Matthias Hochsteger
025f8750be GUI support from Python and some cleanup
Squashed commit of the following:

commit 5058ceb9351548937487aa94073e7f59236ae9fe
Merge: d37f0af 2da1465
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:33:55 2017 +0200

    Merge remote-tracking branch 'origin/master' into native_tcl_macos

commit d37f0afcc1389c0c3ec0899da9c1af158c926ca5
Author: Matthias <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:27:12 2017 +0200

    link gui to netgen, some fixes

commit 297141455cd4fab81709c13d6253ad8114beee4a
Author: Matthias <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:02:47 2017 +0200

    windows fixes

commit 9bf290a60835f29762b15ee3b722da132678f90c
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 18:59:53 2017 +0200

    More cleanup, proper code separation

     ... between netgen exectuable and gui library

commit f46d438d3c9dd32f9f94642b4ec00b85611ef1dd
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 14:03:53 2017 +0200

    fix typos

commit b3d301ff4e321189aef469bff77f7cffa7b69e98
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:32:57 2017 +0200

    also link tk to togl on windows...

commit c3519abee7b041e45c913a45999ed2d29d4ff325
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:30:16 2017 +0200

    link TCL to togl on windows

commit 80b607436b45f38f4bac2708a78ef03561ad44e5
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:26:45 2017 +0200

    linkt TCL only to netgen executable

commit 080139a431e949e14cb9f05194e19c5129aca3d3
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:20:36 2017 +0200

    fix dll ex/import

commit dd68efacb01fbbbe3f136168f12fed41fa3c3c8a
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:15:39 2017 +0200

    fix dll export

commit 9023b9ca49b4c2b99f228f64564990e2d0246b8c
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 12:06:14 2017 +0200

    use system tcl/tk on MacOS, but download tcl/tk for windows

commit 16eb4c1b01eb5229f93274791187b2c666bb8b8e
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 12:01:36 2017 +0200

    more cleanup

commit 6df5b82a7d9a1177a755446d563d6c4b98ff6329
Merge: af23786 2b0d3f0
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 11:45:42 2017 +0200

    Merge remote-tracking branch 'origin/master' into native_tcl_macos

commit af2378637a6513de3b50841ed6314cd7e12f7205
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 11:45:40 2017 +0200

    some cleanup

commit 81bbe117efe25df53c71f9ae603c50ee4557703a
Author: Joachim Schöberl <joachim.schoeberl@tuwien.ac.at>
Date:   Tue May 9 20:14:46 2017 +0200

    tk-gui

commit 387e6da678661dd3b9d75d696733f46fe43d789a
Merge: e658b5b e653d8e
Author: Joachim Schöberl <joachim.schoeberl@tuwien.ac.at>
Date:   Tue May 9 18:49:20 2017 +0200

    Merge remote-tracking branch 'origin/gui_from_python' into native_tcl_macos

commit e658b5b2c1ac3264f4165b5f6d2b821b3b1b0926
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Tue May 9 18:30:35 2017 +0200

    use native tcl on macos

commit e653d8e6789d20e24b16a68bf760415940e881f8
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 16:37:23 2017 +0200

    next fix

commit f663c80b00754d141a02fa6abde2077c841bbafb
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 16:23:21 2017 +0200

    Fix symbol export on windows

commit 70d99782423d33d3fa6f80e758a7377d0cb52840
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 15:14:56 2017 +0200

    GUI support from Python

    Enables experimental support for starting the Netgen GUI from Python
    directly.
    To use it, just import the gui module:
    > import netgen.gui
2017-05-10 19:34:42 +02:00
Matthias Hochsteger
990d0fce78 GUI support from Python
Enables experimental support for starting the Netgen GUI from Python
directly.
To use it, just import the gui module:
> import netgen.gui
2017-05-08 16:42:49 +02:00
Matthias Hochsteger
b48a2bbd5e Support (self written wrapper for) clcache on Windows
Since clcache gets problems for .rc files, the ccache functionality is
disabled in the ng/ subdirectory
2017-02-27 07:29:57 -08:00
Joachim Schöberl
d96ab0c955 fix boundary-condition dialog (needs alignment) 2017-02-08 00:28:44 +01:00
Matthias Hochsteger
74cb50d5ce Update for new FFMPEG version, extra header for implementation 2017-02-03 15:28:59 +01:00
Matthias Hochsteger
d45950c5e1 Implement internaltcl functionality
When passing '-internaltcl' to netgen, it will evaluate a preprocessed
tcl string instead of loading ng.tcl.
The string is stored in the file onetcl.cpp, which is generated by onetcl.py
2017-02-01 15:59:29 +01:00
Matthias Hochsteger
685981d463 Fixes for non-GUI builds 2017-01-31 15:35:56 +01:00
Matthias Hochsteger
424b246eda Workaround to scale up fonts on high resolution Linux systems 2017-01-20 10:39:16 +01:00
Matthias Hochsteger
cc0f14c14c Move more widgets from tk to ttk 2017-01-20 10:33:59 +01:00
Joachim Schöberl
d1de4a7cf9 Introduce NetgenGeometry base class to Python. export meshing first, then csg 2017-01-05 05:08:24 +01:00
Joachim Schöberl
c31240580b remove test output 2017-01-01 15:34:55 +01:00
Christopher Lackner
a5e411d008 load stl fix and some vis 2016-12-12 13:14:47 +01:00
Christopher Lackner
25d2e497b1 add python stl submodule 2016-12-12 10:47:05 +01:00
Christopher Lackner
7e4892a9e7 firststep and laststep as meshingparameters to be exported to python 2016-12-05 13:50:21 +01:00
Matthias
953bd13cf4 Support for OpenGL buffer objects on Windows 2016-12-02 12:27:26 +01:00
Matthias Hochsteger
ee4d5e89d8 remove unnecessary files (mostly unsupported build systems) 2016-11-23 18:07:14 +01:00
Joachim Schöberl
dd72bf984a don't load Tix 2016-11-17 23:46:44 +01:00
Gerhard Kitzler
1fc08e86b1 fixes in occ geometry dialog 2016-11-12 02:27:13 +01:00
Gerhard Kitzler
295e100030 First version of occ tree without tix 2016-11-11 12:13:33 +01:00
Gerhard Kitzler
0b8725795b small fixes 2016-11-10 15:50:54 +01:00
Gerhard Kitzler
2feeb3db08 almost all tix removed 2016-11-10 14:31:04 +01:00
Gerhard Kitzler
fdd2fab64a Merge branch 'master' into remove_tix2 2016-11-10 13:26:18 +01:00