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.

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

Reactivate gpu setting and rename it to "hardware utilization" #4142

Merged
merged 3 commits into from
Jun 24, 2019
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
- Added a histogram to the dataset settings for each layer. It simplifies adjusting the brightness and contrast of a layer and replaces the brightness and contrast slider. [#4105](https://github.com/scalableminds/webknossos/pull/4105)

### Changed
-
- Reactivated and renamed the "Quality" setting to "Hardware Utilization". Using a higher value will render data in higher quality, but puts more stress on the user's hardware and bandwidth. [#4142](https://github.com/scalableminds/webknossos/pull/4142)

### Fixed
- Fixed that team managers couldn't view time tracking details of other users anymore. [#4125](https://github.com/scalableminds/webknossos/pull/4125)
Expand Down
2 changes: 1 addition & 1 deletion docs/tracing_ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ For multi-layer datasets, each layer can be adjusted separately.
- `Render Isosurfaces`: When activated, isosurfaces are rendered in the 3D viewport when clicking on a cell with Shift+Click. See [here](./mesh_visualization.md#live-isosurface-generation) for more information.

#### Quality
- `Quality`: Adjusts the quality level used for rendering data. Changing this setting influences how many data is downloaded from the server as well as how much pressure is put on the user's graphics card. Tune this value to your network connection and hardware power. After changing the setting, the page has to be refreshed.
- `Hardware Utilization`: Adjusts the quality level used for rendering data. Changing this setting influences how many data is downloaded from the server as well as how much pressure is put on the user's graphics card. Tune this value to your network connection and hardware power. After changing the setting, the page has to be refreshed.
- `Loading Strategy`: You can choose between two different loading strategies. When using "best quality first" it will take a bit longer until you see data, because the highest quality is loaded. Alternatively, "Progressive quality" can be chosen which will improve the quality progressively while loading. As a result, initial data will be visible faster, but it will take more time until the best quality is shown.
- `4 Bit`: Toggles data download from the server using only 4 Bit instead of 8 Bit for each pixel. Use this to reduce the amount of necessary internet bandwidth for webKnossos. Useful for showcasing data on the go over cellular networks, e.g 3G.
- `Interpolation`: When interpolation is enabled, bilinear filtering is applied while rendering pixels between two voxels. As a result, data may look "smoother" (or blurry when being zoomed in very far). Without interpolation, data may look more "crisp" (or pixelated when being zomed in very far).
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const settings = {
improving the quality progressively (data will be loaded faster,
but it will take more time until the best quality is shown).`,
mergerMode: "Enable Merger Mode",
gpuMemoryFactor: "Quality",
gpuMemoryFactor: "Hardware Utilization",
autoBrush: "Automatic Brush (Beta)",
};

Expand Down
7 changes: 3 additions & 4 deletions frontend/javascripts/oxalis/model_initialization.js
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ function initializeSettings(initialUserSettings: Object, initialDatasetSettings:
}

function initializeDataLayerInstances(
_gpuFactor: ?number,
gpuFactor: ?number,
): {
dataLayers: DataLayerCollection,
connectionInfo: ConnectionInfo,
Expand All @@ -344,9 +344,8 @@ function initializeDataLayerInstances(
const layers = dataset.dataSource.dataLayers;

const requiredBucketCapacity =
// temporarily, always use the default gpu memory factor
constants.GPU_FACTOR_MULTIPLIER * constants.DEFAULT_GPU_MEMORY_FACTOR;
// (gpuFactor != null ? gpuFactor : constants.DEFAULT_GPU_MEMORY_FACTOR);
constants.GPU_FACTOR_MULTIPLIER *
(gpuFactor != null ? gpuFactor : constants.DEFAULT_GPU_MEMORY_FACTOR);

const {
textureInformationPerLayer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class DatasetSettings extends React.PureComponent<DatasetSettingsProps, State> {
label={
<React.Fragment>
{settings.gpuMemoryFactor}{" "}
<Tooltip title="Adapt this setting to your hardware, so that rendering quality and speed are balanced. Medium is the default.">
<Tooltip title="Adapt this setting to your hardware, so that rendering quality and performance are balanced. Medium is the default. Choosing a higher setting can result in poor performance.">
<Icon type="info-circle" />
</Tooltip>
</React.Fragment>
Expand Down