From 8fd13fda2f5bc5ce1aba20467da7316d54ba71ad Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Tue, 14 Aug 2012 11:59:26 +0200 Subject: [PATCH] Moved MainWindow files out of Gui-folder. --- Gui/CMakeLists.txt => DataExplorer.cmake | 0 Gui/pymainwindow.cpp | 36 ------------------------ Gui/main.cpp => main.cpp | 0 Gui/mainwindow.cpp => mainwindow.cpp | 0 Gui/mainwindow.h => mainwindow.h | 0 Gui/mainwindow.ui => mainwindow.ui | 0 6 files changed, 36 deletions(-) rename Gui/CMakeLists.txt => DataExplorer.cmake (100%) delete mode 100644 Gui/pymainwindow.cpp rename Gui/main.cpp => main.cpp (100%) rename Gui/mainwindow.cpp => mainwindow.cpp (100%) rename Gui/mainwindow.h => mainwindow.h (100%) rename Gui/mainwindow.ui => mainwindow.ui (100%) diff --git a/Gui/CMakeLists.txt b/DataExplorer.cmake similarity index 100% rename from Gui/CMakeLists.txt rename to DataExplorer.cmake diff --git a/Gui/pymainwindow.cpp b/Gui/pymainwindow.cpp deleted file mode 100644 index b761cb2134e..00000000000 --- a/Gui/pymainwindow.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/** - * \file pymainwindow.cpp - * 2/6/2010 LB Initial implementation - * - * Implementation of pymainwindow - */ - -// ** INCLUDES ** -#include "boost/python.hpp" - -#include "mainwindow.h" - -using namespace boost::python; -namespace python = boost::python; - -BOOST_PYTHON_MODULE(ogsgui) -{ - class_<MainWindow, boost::noncopyable>("ogsgui", init<>()) - .def("ShowWindow", &MainWindow::ShowWindow) - .def("HideWindow", &MainWindow::HideWindow) - ; - - class_<StartQt4, boost::noncopyable>("StartQt4", init<>()); -} -/** - TODO - vtkWidget entfernen, sonst Konflikt zwischen VRED Renderfenster und vtkWidget - - Weiteres Problem: vred Prozess läuft nach Beenden von VRED weiter - - import imp - ogsmodule = imp.load_dynamic('ogsgui', 'E:/bilke/geosys/branch/sources/Build/lib/Release/ogs-gui-vred.dll') - qt = ogsmodule.StartQt4() - ogs = ogsmodule.ogsgui() - ogs.ShowWindow() - */ \ No newline at end of file diff --git a/Gui/main.cpp b/main.cpp similarity index 100% rename from Gui/main.cpp rename to main.cpp diff --git a/Gui/mainwindow.cpp b/mainwindow.cpp similarity index 100% rename from Gui/mainwindow.cpp rename to mainwindow.cpp diff --git a/Gui/mainwindow.h b/mainwindow.h similarity index 100% rename from Gui/mainwindow.h rename to mainwindow.h diff --git a/Gui/mainwindow.ui b/mainwindow.ui similarity index 100% rename from Gui/mainwindow.ui rename to mainwindow.ui -- GitLab