Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Orange/widgets/data/owcorrelations.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ class Inputs:
class Outputs:
data = Output("Data", Table)
features = Output("Features", AttributeList)
correlations = Output("Correlations", Table)
correlations = Output("Correlations", Table, dynamic=False)

want_main_area = False
want_control_area = True
Expand Down
7 changes: 5 additions & 2 deletions Orange/widgets/data/owcsvimport.py
Original file line number Diff line number Diff line change
Expand Up @@ -627,12 +627,15 @@ class Outputs:
data = widget.Output(
name="Data",
type=Orange.data.Table,
doc="Loaded data set.")
doc="Loaded data set.",
dynamic=False,
)
data_frame = widget.Output(
name="Data Frame",
type=pd.DataFrame,
doc="",
auto_summary=False
auto_summary=False,
dynamic=False,
)

class Error(widget.OWWidget.Error):
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/data/owmelt.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Inputs:
data = widget.Input("Data", Table)

class Outputs:
data = widget.Output("Data", Table)
data = widget.Output("Data", Table, dynamic=False)

class Information(widget.OWWidget.Information):
no_suitable_features = Msg(
Expand Down
3 changes: 2 additions & 1 deletion Orange/widgets/data/owmergedata.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ class Inputs:
class Outputs:
data = Output("Data",
Orange.data.Table,
replaces=["Merged Data A+B", "Merged Data B+A", "Merged Data"])
replaces=["Merged Data A+B", "Merged Data B+A", "Merged Data"],
dynamic=False)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one I'm unsure of. Could I not merge two corpora? I do this often (append metadata to a corpus).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I can gather this will always create a plain Table
https://github.com/biolab/orange3/blob/3.38.1/Orange/widgets/data/owmergedata.py#L630-L632

        table = Orange.data.Table.from_numpy(domain, X, Y, metas)
        table.name = getattr(self.data, 'name', '')
        table.attributes = getattr(self.data, 'attributes', {})

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, we might have discussed this with Primož at some point and agreed it should be a Table.


LeftJoin, InnerJoin, OuterJoin = range(3)
OptionNames = ("Append columns from Extra data",
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/data/owpaintdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ class Inputs:
data = Input("Data", Table)

class Outputs:
data = Output("Data", Table)
data = Output("Data", Table, dynamic=False)

autocommit = Setting(True)
table_name = Setting("Painted data")
Expand Down
4 changes: 2 additions & 2 deletions Orange/widgets/data/owpivot.py
Original file line number Diff line number Diff line change
Expand Up @@ -731,9 +731,9 @@ class Inputs:
data = Input("Data", Table, default=True)

class Outputs:
pivot_table = Output("Pivot Table", Table, default=True)
pivot_table = Output("Pivot Table", Table, default=True, dynamic=False)
filtered_data = Output("Filtered Data", Table)
grouped_data = Output("Grouped Data", Table)
grouped_data = Output("Grouped Data", Table, dynamic=False)

class Warning(OWWidget.Warning):
# TODO - inconsistent for different variable types
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/data/owrank.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class Inputs:

class Outputs:
reduced_data = Output("Reduced Data", Table, default=True)
scores = Output("Scores", Table)
scores = Output("Scores", Table, dynamic=False)
features = Output("Features", AttributeList, dynamic=False)

SelectNone, SelectAll, SelectManual, SelectNBest = range(4)
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/unsupervised/owcorrespondence.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Inputs:
data = Input("Data", Table)

class Outputs:
coordinates = Output("Coordinates", Table)
coordinates = Output("Coordinates", Table, dynamic=False)

Invalidate = QEvent.registerEventType()

Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/unsupervised/owkmeans.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class Outputs:
ANNOTATED_DATA_SIGNAL_NAME, Table, default=True,
replaces=["Annotated Data"]
)
centroids = Output("Centroids", Table)
centroids = Output("Centroids", Table, dynamic=False)

class Error(widget.OWWidget.Error):
failed = widget.Msg("Clustering failed\nError: {}")
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/unsupervised/owlouvainclustering.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Inputs:
class Outputs:
annotated_data = Output(ANNOTATED_DATA_SIGNAL_NAME, Table, default=True)
if Network is not None:
graph = Output("Network", Network)
graph = Output("Network", Network, dynamic=False)

apply_pca = Setting(True)
pca_components = Setting(_DEFAULT_PCA_COMPONENTS)
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/unsupervised/owpca.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Inputs:
class Outputs:
transformed_data = Output("Transformed Data", Table, replaces=["Transformed data"])
data = Output("Data", Table, default=True)
components = Output("Components", Table)
components = Output("Components", Table, dynamic=False)
pca = Output("PCA", PCA, dynamic=False)

ncomponents = Setting(2)
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/visualize/owdistributions.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ class Inputs:
class Outputs:
selected_data = Output("Selected Data", Table, default=True)
annotated_data = Output(ANNOTATED_DATA_SIGNAL_NAME, Table)
histogram_data = Output("Histogram Data", Table)
histogram_data = Output("Histogram Data", Table, dynamic=False)

class Error(OWWidget.Error):
no_defined_values_var = \
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/visualize/utils/widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ class OWAnchorProjectionWidget(OWDataProjectionWidget, openclass=True):
graph = SettingProvider(OWGraphWithAnchors)

class Outputs(OWDataProjectionWidget.Outputs):
components = Output("Components", Table)
components = Output("Components", Table, dynamic=False)

class Error(OWDataProjectionWidget.Error):
sparse_data = Msg("Sparse data is not supported")
Expand Down
Loading