-
Notifications
You must be signed in to change notification settings - Fork 24
Add in situ XRD block that can handle temperature and electrochemical data #1287
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,7 +38,6 @@ class CycleBlock(DataBlock): | |
| ".txt", | ||
| ".xls", | ||
| ".xlsx", | ||
| ".txt", | ||
| ".res", | ||
| ".nda", | ||
| ".ndax", | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,233 @@ | ||
| <template> | ||
| <DataBlockBase :item_id="item_id" :block_id="block_id"> | ||
| <div class="mb-2 d-flex align-items-center"> | ||
| <label class="mr-2"><b>Mode:</b></label> | ||
| <div class="btn-group" role="group" aria-label="Mode toggle"> | ||
| <button | ||
| type="button" | ||
| class="btn" | ||
| :class="isEchemMode ? 'btn-outline-secondary' : 'btn-secondary'" | ||
| @click="setMode('log')" | ||
| > | ||
| Temperature | ||
| </button> | ||
| <button | ||
| type="button" | ||
| class="btn" | ||
| :class="isEchemMode ? 'btn-secondary' : 'btn-outline-secondary'" | ||
| @click="setMode('echem')" | ||
| > | ||
| Electrochemistry | ||
| </button> | ||
| </div> | ||
| </div> | ||
| <FileSelectDropdown | ||
| v-model="file_id" | ||
| :item_id="item_id" | ||
| :block_id="block_id" | ||
| :extensions="blockInfo.attributes.accepted_file_extensions" | ||
| update-block-on-change | ||
| @change="onFileChange" | ||
| /> | ||
| <div v-show="file_id"> | ||
| <div class="row"> | ||
| <div class="col-lg-4 col-md-6 col-sm-12 mb-2"> | ||
| <label class="mr-2"><b>XRD folder name</b></label> | ||
| <FolderSelect | ||
| v-model="xrd_folder_name" | ||
| :options="availableFolders" | ||
| @update:model-value="onFolderSelected" | ||
| /> | ||
| </div> | ||
| <div class="col-lg-4 col-md-6 col-sm-12 mb-2"> | ||
| <label class="mr-2"><b>Log folder name</b></label> | ||
| <FolderSelect | ||
| v-model="time_series_folder_name" | ||
| :options="availableFolders" | ||
| @update:model-value="onFolderSelected" | ||
| /> | ||
| </div> | ||
| <div v-if="isEchemMode" class="col-lg-4 col-md-6 col-sm-12 mb-2"> | ||
| <label class="mr-2"><b>Echem folder name</b></label> | ||
| <FolderSelect | ||
| v-model="echem_folder_name" | ||
| :options="availableFolders" | ||
| @update:model-value="onFolderSelected" | ||
| /> | ||
| </div> | ||
| </div> | ||
| <div v-if="folderNameError" class="alert alert-danger mt-2 mx-auto"> | ||
| {{ folderNameError }} | ||
| </div> | ||
| </div> | ||
| <div class="form-inline mb-2"> | ||
| <label class="mr-2"><b>Data granularity</b></label> | ||
| <input | ||
| v-model="data_granularity_buffer" | ||
| type="text" | ||
| class="form-control mr-3" | ||
| style="width: 100px; display: inline-block" | ||
| /> | ||
| <label class="mr-2"><b>Sample granularity</b></label> | ||
| <input | ||
| v-model="sample_granularity_buffer" | ||
| type="text" | ||
| class="form-control" | ||
| style="width: 100px; display: inline-block" | ||
| /> | ||
| <button class="btn btn-primary ml-3" @click="onGranularitySubmit">Apply</button> | ||
| </div> | ||
| <div | ||
| v-show="xrd_folder_name && time_series_folder_name" | ||
| class="row mt-2 text-center justify-content-center" | ||
| > | ||
| <div | ||
| id="bokehPlotContainer" | ||
| class="col-xl-10 col-lg-11 col-md-12 d-flex justify-content-center overflow-auto" | ||
| > | ||
| <BokehPlot :bokeh-plot-data="bokehPlotData" class="mw-100" /> | ||
| </div> | ||
| </div> | ||
| </DataBlockBase> | ||
| </template> | ||
|
|
||
| <script> | ||
| import DataBlockBase from "@/components/datablocks/DataBlockBase"; | ||
| import FileSelectDropdown from "@/components/FileSelectDropdown"; | ||
| import FolderSelect from "@/components/FolderSelect"; | ||
| import BokehPlot from "@/components/BokehPlot"; | ||
|
|
||
| import { createComputedSetterForBlockField } from "@/field_utils.js"; | ||
| import { updateBlockFromServer } from "@/server_fetch_utils.js"; | ||
|
|
||
| export default { | ||
| components: { | ||
| DataBlockBase, | ||
| FileSelectDropdown, | ||
| FolderSelect, | ||
| BokehPlot, | ||
| }, | ||
| props: { | ||
| item_id: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| block_id: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| }, | ||
| data() { | ||
| return { | ||
| folderNameError: "", | ||
| isUpdating: false, | ||
| }; | ||
| }, | ||
| watch: { | ||
| data_granularity: { | ||
| immediate: true, | ||
| handler(newVal) { | ||
| this.data_granularity_buffer = newVal; | ||
| }, | ||
| }, | ||
| sample_granularity: { | ||
| immediate: true, | ||
| handler(newVal) { | ||
| this.sample_granularity_buffer = newVal; | ||
| }, | ||
| }, | ||
| }, | ||
| computed: { | ||
| bokehPlotData() { | ||
| return this.$store.state.all_item_data[this.item_id]["blocks_obj"][this.block_id] | ||
| .bokeh_plot_data; | ||
| }, | ||
| blockInfo() { | ||
| return this.$store.state.blocksInfos["insitu-xrd"]; | ||
| }, | ||
| all_files() { | ||
| return this.$store.state.all_item_data[this.item_id].files; | ||
| }, | ||
| currentBlock() { | ||
| return this.$store.state.all_item_data[this.item_id]["blocks_obj"][this.block_id]; | ||
| }, | ||
| availableFolders() { | ||
| return this.currentBlock.available_folders || []; | ||
| }, | ||
| xrd_folder_name: createComputedSetterForBlockField("xrd_folder_name"), | ||
| time_series_folder_name: createComputedSetterForBlockField("time_series_folder_name"), | ||
| echem_folder_name: createComputedSetterForBlockField("echem_folder_name"), | ||
| file_id: createComputedSetterForBlockField("file_id"), | ||
| folder_name: createComputedSetterForBlockField("folder_name"), | ||
| data_granularity: createComputedSetterForBlockField("data_granularity"), | ||
| sample_granularity: createComputedSetterForBlockField("sample_granularity"), | ||
| time_series_source: createComputedSetterForBlockField("time_series_source"), | ||
| isEchemMode() { | ||
| return this.time_series_source === "echem"; | ||
| }, | ||
| }, | ||
| created() { | ||
| // Ensure time_series_source is set to "log" by default if not present | ||
| if (this.time_series_source === undefined || this.time_series_source === null) { | ||
| this.time_series_source = "log"; | ||
| } | ||
| }, | ||
| methods: { | ||
| setMode(mode) { | ||
| this.time_series_source = mode; | ||
| this.xrd_folder_name = ""; | ||
| this.time_series_folder_name = ""; | ||
| this.echem_folder_name = ""; | ||
| this.folderNameError = ""; | ||
| this.updateBlock(); | ||
| console.info("Mode set to", mode); | ||
| }, | ||
| onFileChange() { | ||
| this.xrd_folder_name = ""; | ||
| this.time_series_folder_name = ""; | ||
| this.echem_folder_name = ""; | ||
| this.updateBlock(); | ||
| }, | ||
| onFolderSelected() { | ||
| if ( | ||
| this.xrd_folder_name && | ||
| this.time_series_folder_name && | ||
| (!this.isEchemMode || this.echem_folder_name) | ||
| ) { | ||
| this.updateBlock(); | ||
| } | ||
| }, | ||
| onGranularitySubmit() { | ||
| const dataVal = parseFloat(this.data_granularity_buffer); | ||
| const sampleVal = parseFloat(this.sample_granularity_buffer); | ||
|
|
||
| if (!isNaN(dataVal)) this.data_granularity = dataVal; | ||
| if (!isNaN(sampleVal)) this.sample_granularity = sampleVal; | ||
|
|
||
| if (!isNaN(dataVal) || !isNaN(sampleVal)) { | ||
| this.updateBlock(); | ||
| } | ||
| }, | ||
| updateBlock() { | ||
| this.isLoading = true; | ||
ml-evs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const foundFile = this.all_files.find((file) => file.immutable_id === this.file_id); | ||
| this.folder_name = foundFile?.name || "Folder not found"; | ||
|
|
||
| const blockToUpdate = { | ||
| ...this.$store.state.all_item_data[this.item_id]["blocks_obj"][this.block_id], | ||
| }; | ||
|
|
||
| updateBlockFromServer(this.item_id, this.block_id, blockToUpdate) | ||
| .then(() => { | ||
| this.isLoading = false; | ||
| }) | ||
| .catch((error) => { | ||
| this.isLoading = false; | ||
| console.error("Error updating block:", error); | ||
| }); | ||
| }, | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style scoped></style> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.