forked from enviPath/enviPy
Compare commits
4 Commits
fix/issue2
...
d584791ee8
| Author | SHA1 | Date | |
|---|---|---|---|
| d584791ee8 | |||
| e60052b05c | |||
| 3ff8d938d6 | |||
| a7f48c2cf9 |
@ -151,11 +151,6 @@
|
|||||||
>Package</a
|
>Package</a
|
||||||
>
|
>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
|
||||||
<a href="{{ meta.server_url }}/search" id="searchLink"
|
|
||||||
>Search</a
|
|
||||||
>
|
|
||||||
</li>
|
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ meta.server_url }}/model" id="modelLink"
|
<a href="{{ meta.server_url }}/model" id="modelLink"
|
||||||
>Modelling</a
|
>Modelling</a
|
||||||
|
|||||||
@ -119,7 +119,9 @@
|
|||||||
>Ibuprofen</a
|
>Ibuprofen</a
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<a class="absolute top-0 left-[calc(100%-5.4rem)]" href="#"
|
<a
|
||||||
|
class="absolute top-0 left-[calc(100%-5.4rem)]"
|
||||||
|
href="/predict"
|
||||||
>Advanced</a
|
>Advanced</a
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
@ -256,6 +258,31 @@
|
|||||||
<script language="javascript">
|
<script language="javascript">
|
||||||
var currentPackage = "{{ meta.current_package.url }}";
|
var currentPackage = "{{ meta.current_package.url }}";
|
||||||
|
|
||||||
|
// Helper function to safely get Ketcher instance from iframe
|
||||||
|
function getKetcherInstance(iframeId) {
|
||||||
|
const ketcherFrame = document.getElementById(iframeId);
|
||||||
|
if (!ketcherFrame) {
|
||||||
|
console.error("Ketcher iframe not found:", iframeId);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (
|
||||||
|
"contentWindow" in ketcherFrame &&
|
||||||
|
ketcherFrame.contentWindow.ketcher
|
||||||
|
) {
|
||||||
|
return ketcherFrame.contentWindow.ketcher;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error(
|
||||||
|
"Cannot access Ketcher iframe - possible CORS issue:",
|
||||||
|
err,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
// Discourse API integration is now handled by discourse-api.js
|
// Discourse API integration is now handled by discourse-api.js
|
||||||
|
|
||||||
// Function to render Discourse topics into cards
|
// Function to render Discourse topics into cards
|
||||||
@ -359,10 +386,16 @@
|
|||||||
}, 300);
|
}, 300);
|
||||||
|
|
||||||
// Transfer SMILES from Ketcher to text input if available
|
// Transfer SMILES from Ketcher to text input if available
|
||||||
if (window.indexKetcher && window.indexKetcher.getSmiles) {
|
const ketcher = getKetcherInstance("index-ketcher");
|
||||||
const smiles = window.indexKetcher.getSmiles();
|
if (ketcher && ketcher.getSmiles) {
|
||||||
if (smiles && smiles.trim() !== "") {
|
try {
|
||||||
$("#index-form-text-input").val(smiles);
|
const smiles = ketcher.getSmiles();
|
||||||
|
if (smiles && smiles.trim() !== "") {
|
||||||
|
$("#index-form-text-input").val(smiles);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to sync Ketcher to text input:", err);
|
||||||
|
// Non-critical error, just log it
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -431,13 +464,32 @@
|
|||||||
var textSmiles = "";
|
var textSmiles = "";
|
||||||
|
|
||||||
// Check if we're in Ketcher mode and extract SMILES
|
// Check if we're in Ketcher mode and extract SMILES
|
||||||
if ($('input[type="checkbox"]').is(":checked") && window.indexKetcher) {
|
if ($('input[type="checkbox"]').is(":checked")) {
|
||||||
textSmiles = window.indexKetcher.getSmiles().trim();
|
// Use the robust getter function
|
||||||
|
const ketcher = getKetcherInstance("index-ketcher");
|
||||||
|
if (ketcher && ketcher.getSmiles) {
|
||||||
|
try {
|
||||||
|
textSmiles = ketcher.getSmiles().trim();
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to get SMILES from Ketcher:", err);
|
||||||
|
alert(
|
||||||
|
"Unable to extract structure from the drawing editor. Please try again or switch to SMILES input mode.",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.warn("Ketcher not available, possibly still loading");
|
||||||
|
alert(
|
||||||
|
"The drawing editor is still loading. Please wait a moment and try again.",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
textSmiles = $("#index-form-text-input").val().trim();
|
textSmiles = $("#index-form-text-input").val().trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (textSmiles === "") {
|
if (textSmiles === "") {
|
||||||
|
alert("Please enter a SMILES string or draw a structure.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -26,6 +26,7 @@
|
|||||||
placeholder="Name"
|
placeholder="Name"
|
||||||
id="name"
|
id="name"
|
||||||
class="input input-md w-full"
|
class="input input-md w-full"
|
||||||
|
autofocus
|
||||||
/>
|
/>
|
||||||
<span>Name</span>
|
<span>Name</span>
|
||||||
</label>
|
</label>
|
||||||
@ -137,6 +138,25 @@
|
|||||||
</div>
|
</div>
|
||||||
{# prettier-ignore-start #}
|
{# prettier-ignore-start #}
|
||||||
<script>
|
<script>
|
||||||
|
// Helper function to safely get Ketcher instance from iframe
|
||||||
|
function getKetcherInstance(iframeId) {
|
||||||
|
const ketcherFrame = document.getElementById(iframeId);
|
||||||
|
if (!ketcherFrame) {
|
||||||
|
console.error("Ketcher iframe not found:", iframeId);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
if ('contentWindow' in ketcherFrame && ketcherFrame.contentWindow.ketcher) {
|
||||||
|
return ketcherFrame.contentWindow.ketcher;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Cannot access Ketcher iframe - possible CORS issue:", err);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
function predictKetcherToTextInput() {
|
function predictKetcherToTextInput() {
|
||||||
$("#predict-smiles").val(this.ketcher.getSmiles());
|
$("#predict-smiles").val(this.ketcher.getSmiles());
|
||||||
}
|
}
|
||||||
@ -171,10 +191,21 @@
|
|||||||
let smiles = $("#predict-smiles").val().trim();
|
let smiles = $("#predict-smiles").val().trim();
|
||||||
|
|
||||||
// If SMILES input is empty, try to get from Ketcher
|
// If SMILES input is empty, try to get from Ketcher
|
||||||
if (!smiles && window.predictKetcher) {
|
if (!smiles) {
|
||||||
smiles = window.predictKetcher.getSmiles().trim();
|
const ketcher = getKetcherInstance('predict-ketcher');
|
||||||
if (smiles) {
|
if (ketcher && ketcher.getSmiles) {
|
||||||
$("#predict-smiles").val(smiles);
|
try {
|
||||||
|
smiles = ketcher.getSmiles().trim();
|
||||||
|
if (smiles) {
|
||||||
|
$("#predict-smiles").val(smiles);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to get SMILES from Ketcher:", err);
|
||||||
|
alert("Unable to extract structure from the drawing editor. Please enter a SMILES string instead.");
|
||||||
|
button.prop("disabled", false);
|
||||||
|
button.text("Predict");
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user