Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move plot_api #8897

Closed
wants to merge 1 commit into from
Closed

Move plot_api #8897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 src/ert/gui/tools/plot/plot_api.py → src/ert/gui/plot_api.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plot_config_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from ert.gui.plottery import PlotConfig

if TYPE_CHECKING:
from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
from ert.gui.plot_api import PlotApiKeyDefinition


class PlotConfigFactory:
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plot_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
if TYPE_CHECKING:
from pandas import DataFrame

from ert.gui.plot_api import EnsembleObject
from ert.gui.plottery import PlotConfig
from ert.gui.tools.plot.plot_api import EnsembleObject


class PlotContext:
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plots/cesp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from matplotlib.lines import Line2D
from matplotlib.patches import Rectangle

from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.gui.plot_api import EnsembleObject

from .plot_tools import PlotTools

Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plots/distribution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
import pandas as pd

from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.gui.plot_api import EnsembleObject

from .plot_tools import PlotTools

Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plots/ensemble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
from matplotlib.axes import Axes
from matplotlib.figure import Figure

from ert.gui.plot_api import EnsembleObject
from ert.gui.plottery import PlotConfig, PlotContext
from ert.gui.tools.plot.plot_api import EnsembleObject


class EnsemblePlot:
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plots/gaussian_kde.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pandas as pd
from scipy.stats import gaussian_kde

from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.gui.plot_api import EnsembleObject

from .plot_tools import PlotTools

Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plots/histogram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import pandas as pd
from matplotlib.patches import Rectangle

from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.gui.plot_api import EnsembleObject

from .plot_tools import PlotTools

Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plots/statistics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from matplotlib.axes import Axes
from matplotlib.figure import Figure

from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.gui.plot_api import EnsembleObject


class StatisticsPlot:
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/plottery/plots/std_dev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from matplotlib.figure import Figure
from mpl_toolkits.axes_grid1 import make_axes_locatable

from ert.gui.plot_api import EnsembleObject
from ert.gui.plottery import PlotContext
from ert.gui.tools.plot.plot_api import EnsembleObject


class StdDevPlot:
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/tools/plot/customize/customize_plot_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
QWidgetAction,
)

from ert.gui.plot_api import PlotApiKeyDefinition
from ert.gui.plottery import PlotConfig, PlotConfigFactory, PlotConfigHistory
from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
from ert.gui.tools.plot.widgets import CopyStyleToDialog

from .default_customization_view import DefaultCustomizationView
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/tools/plot/data_type_keys_list_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from qtpy.QtGui import QColor, QIcon
from typing_extensions import override

from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
from ert.gui.plot_api import PlotApiKeyDefinition


class DataTypeKeysListModel(QAbstractItemModel):
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/tools/plot/data_type_keys_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
)

from ert.gui.ertwidgets import SearchBox
from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
from ert.gui.plot_api import PlotApiKeyDefinition

from .data_type_keys_list_model import DataTypeKeysListModel
from .data_type_proxy_model import DataTypeProxyModel
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/tools/plot/filter_popup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
QWidget,
)

from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
from ert.gui.plot_api import PlotApiKeyDefinition


class FilterPopup(QDialog):
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/tools/plot/filterable_kw_list_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Dict, List

from ert.gui.ertwidgets.models.selectable_list_model import SelectableListModel
from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
from ert.gui.plot_api import PlotApiKeyDefinition


class FilterableKwListModel(SelectableListModel):
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/tools/plot/plot_ensemble_selection_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
QWidget,
)

from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.gui.plot_api import EnsembleObject


class EnsembleSelectionWidget(QWidget):
Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/tools/plot/plot_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
QWidgetAction,
)

from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.gui.plot_api import EnsembleObject

if TYPE_CHECKING:
from ert.gui.plottery import PlotContext
Expand Down
3 changes: 1 addition & 2 deletions src/ert/gui/tools/plot/plot_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from qtpy.QtWidgets import QDockWidget, QMainWindow, QTabWidget, QWidget

from ert.gui.ertwidgets import showWaitCursorWhileWaiting
from ert.gui.plot_api import EnsembleObject, PlotApi, PlotApiKeyDefinition
from ert.gui.plottery import PlotConfig, PlotContext
from ert.gui.plottery.plots.cesp import CrossEnsembleStatisticsPlot
from ert.gui.plottery.plots.distribution import DistributionPlot
Expand All @@ -18,11 +19,9 @@
from ert.gui.plottery.plots.histogram import HistogramPlot
from ert.gui.plottery.plots.statistics import StatisticsPlot
from ert.gui.plottery.plots.std_dev import StdDevPlot
from ert.gui.tools.plot.plot_api import EnsembleObject, PlotApiKeyDefinition

from .customize import PlotCustomizer
from .data_type_keys_widget import DataTypeKeysWidget
from .plot_api import PlotApi
from .plot_ensemble_selection_widget import EnsembleSelectionWidget
from .plot_widget import PlotWidget

Expand Down
2 changes: 1 addition & 1 deletion src/ert/gui/tools/plot/widgets/copy_style_to_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
)

from ert.gui.ertwidgets import CheckList
from ert.gui.plot_api import PlotApiKeyDefinition
from ert.gui.tools.plot import FilterableKwListModel, FilterPopup
from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition


class CopyStyleToDialog(QDialog):
Expand Down
2 changes: 1 addition & 1 deletion tests/ert/unit_tests/gui/ertwidgets/test_plot_case_selection_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pytestqt.qtbot import QtBot
from qtpy.QtCore import Qt

from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.gui.plot_api import EnsembleObject
from ert.gui.tools.plot.plot_ensemble_selection_widget import (
EnsembleSelectionWidget,
EnsembleSelectListWidget,
Expand Down
2 changes: 1 addition & 1 deletion tests/ert/unit_tests/gui/plottery/test_ensemble_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import pytest
from matplotlib.figure import Figure

from ert.gui.plot_api import EnsembleObject
from ert.gui.plottery import PlotConfig, PlotContext
from ert.gui.plottery.plots.ensemble import EnsemblePlot
from ert.gui.tools.plot.plot_api import EnsembleObject
from ert.summary_key_type import is_rate


Expand Down
2 changes: 1 addition & 1 deletion tests/ert/unit_tests/gui/plottery/test_histogram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import pytest
from matplotlib.figure import Figure

from ert.gui.plot_api import EnsembleObject
from ert.gui.plottery import PlotConfig, PlotContext
from ert.gui.plottery.plots.histogram import HistogramPlot
from ert.gui.tools.plot.plot_api import EnsembleObject


@pytest.fixture(
Expand Down
2 changes: 1 addition & 1 deletion tests/ert/unit_tests/gui/plottery/test_stddev_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import pytest
from matplotlib.figure import Figure

from ert.gui.plot_api import EnsembleObject
from ert.gui.plottery import PlotConfig, PlotContext
from ert.gui.plottery.plots.std_dev import StdDevPlot
from ert.gui.tools.plot.plot_api import EnsembleObject


@pytest.fixture()
Expand Down
2 changes: 1 addition & 1 deletion tests/ert/unit_tests/gui/tools/plot/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import pandas as pd
import pytest

from ert.gui.tools.plot.plot_api import PlotApi
from ert.gui.plot_api import PlotApi
from ert.services import StorageService


Expand Down
2 changes: 1 addition & 1 deletion tests/ert/unit_tests/gui/tools/plot/test_plot_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest
from pandas.testing import assert_frame_equal

from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
from ert.gui.plot_api import PlotApiKeyDefinition
from tests.ert.unit_tests.gui.tools.plot.conftest import MockResponse


Expand Down