Fixes problem with samp in 1D

yafitsv/public/javascript/modules/samp_utils.js

@@ -112,6 +112,7 @@ var SAMPPublisher = function(connector, dataPaths) {
 
 var sAMPPublisher = undefined;
 var setOnHubAvailability = undefined;
+var setOnHubAvailabilityButtons1D = undefined;
 var setOnHubAvailability2D = undefined;
 var setOnHubAvailabilityButtons = undefined;
 var setOnHubAvailabilityButtonsFirstExec = true;
@@ -179,7 +180,7 @@ if (withSAMP) {
     /**
      * Enable or disable SAMP in 2D slice
      */
-    setOnHubAvailability2D = function(customControls,publishSAMP) {
+    /*setOnHubAvailability2D = function(customControls,publishSAMP) {
         samp_registration_area2D.append(connector.createRegButtons());
         let configureSampEnabled = function(isHubRunning) {
             //if the hub is not running or the registration into the hub is not done yet, 
@@ -195,7 +196,7 @@ if (withSAMP) {
             }
         };
         connector.onHubAvailability(configureSampEnabled, 3000);
-    };
+    };*/
 
     /**
      * Enable or disable SAMP in 3D slice
@@ -223,6 +224,19 @@ if (withSAMP) {
         };
         connector.onHubAvailability(configureSampEnabled, 3000);
     };
+
+    setOnHubAvailabilityButtons1D = function(samp_registration_area) {
+        if(setOnHubAvailabilityButtonsFirstExec){
+            samp_registration_area.append(connector.createRegButtons());
+            setOnHubAvailabilityButtonsFirstExec = false;
+        }        
+        //connector.onHubAvailability(configureSampEnabled, 3000);
+    };
+
+
+
+
+
     /**
      * Enable or disable SAMP from a list of viewers
      * @param {*} viewers 
@@ -270,6 +284,7 @@ if (withSAMP) {
 export {
     sAMPPublisher,
     setOnHubAvailability,
-    setOnHubAvailability2D,
+    //setOnHubAvailability2D,
+    setOnHubAvailabilityButtons1D,
     setOnHubAvailabilityButtons
 }
\ No newline at end of file

yafitsv/public/javascript/olqv1d.js

@@ -11,6 +11,7 @@ import { SpectroApi } from "./modules/serverApi.js";
 import {Tester} from "./tests/test1d.js";
 import { setNedUiListeners, setSpectroUiListeners, initSpectroUI, 
          initSamp, initCubeSmoothing } from "./modules/listeners.js";
+import { setOnHubAvailabilityButtons1D } from "./modules/samp_utils.js";
 
 
 // get user input from spectroscopy form
@@ -171,6 +172,9 @@ $(document).ready(function() {
 
     // Shows SAMP connector logo if SAMP is activated
     initSamp(withSAMP);
+    if(withSAMP){
+        setOnHubAvailabilityButtons1D(DOMAccessor.get3DSampConnection());
+    }
 
     $("#toggle-options").on("click", function(event) {
        

yafitsv/views/olqv2d.ejs

@@ -79,7 +79,7 @@
     </div>
 
     <div id="fullscreen sidepanel">
-        <div class="container yafits-container">
+        <div class="container">
             <nav class="navbar navbar-dark bg-dark">
                 <button class="navbar-toggler" type="button" data-toggle="collapse"
                     data-target="#navbar-toggle-external-content" aria-controls="navbar-toggle-external-content"