Skip to content

Commit

Permalink
Restructure ert
Browse files Browse the repository at this point in the history
  • Loading branch information
ManInFez committed Apr 11, 2019
1 parent 9c2c70e commit d67dc93
Show file tree
Hide file tree
Showing 476 changed files with 22 additions and 17 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def createTopLayout(self):
top_layout = QHBoxLayout()

image_label = QLabel()
image = resourceImage("splash.jpg")
image = resourceImage("splash.png")
image_label.setPixmap(image.scaled(200, 240, Qt.KeepAspectRatio))

top_layout.addWidget(image_label)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def __init__(self):
self.setGeometry(x, y, splash_width, splash_height)


self.splash_image = resourceImage("splash.jpg")
self.splash_image = resourceImage("splash.png")

self.ert = "ERT"
self.ert_title = "Ensemble based Reservoir Tool"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 5 additions & 11 deletions python/python/ert_gui/gert_main.py → ert_gui/gert_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,22 +138,16 @@
import os
from res.enkf import EnKFMain, ResConfig
from res.util import ResLog
from res.util import ResVersion

import res
import ecl
import sys
import time

if os.getenv("ERT_SHARE_PATH"):
ert_share_path = os.getenv("ERT_SHARE_PATH")
else:
# If the ERT_SHARE_PATH variable is not set we try to use the
# source location relative to the location of the current file;
# assuming we are in the source directory. Will not work if we are
# in an arbitrary build directory.
ert_share_path = os.path.realpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../../share/ert"))
import pkg_resources

ert_gui.ertwidgets.img_prefix = ert_share_path + "/gui/img/"
pkg_dir = os.path.join(pkg_resources.working_set.by_key['ensemble-reservoir-tool'].location, 'ert_gui')
ert_gui.ertwidgets.img_prefix = os.path.join(pkg_dir, "resources/gui/img/")


def main(argv):
Expand Down Expand Up @@ -199,7 +193,7 @@ def main(argv):
config_file = argv[1]

help_center = HelpCenter("ERT")
help_center.setHelpLinkPrefix(ert_share_path + "/gui/help/")
help_center.setHelpLinkPrefix(pkg_dir + "resources/gui/help/")
help_center.setHelpMessageLink("welcome_to_ert")

strict = True
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added ert_gui/resources/gui/img/splash.png
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d67dc93

Please sign in to comment.