Move twisted server and pydas out of slicer python environment

Author: yuzhengZ

controllers/components/ApiComponent.php

@@ -592,6 +592,7 @@ public function addJobstatuses($args)
    * will return a job object for a job_id with the current status,
    * along with any related jobstatus objects for that job.
    * @param job_id the id of the job to query status for.
+   * @param status_only (Optional) If set, will only return the array of jobstatus objects
    * @return array ('job' => the job object,
                     'jobstatuses' => the array of jobstatus objects,
                     'condition_rows' => array of job condition lines, if any,
@@ -621,11 +622,18 @@ public function getJobstatus($args)
 
     // get the status details
     $jobstatuses = $jobstatusModel->getForJob($job);
-
-    $pipelineComponent = MidasLoader::loadComponent('Pipeline', 'pyslicer');
-    $conditionRows = $pipelineComponent->formatJobCondition($job->getCondition());
-    $inputsAndOutputs = $pipelineComponent->resolveInputsAndOutputs($job);
-    return array('job' => $job, 'jobstatuses' => $jobstatuses, 'condition_rows' => $conditionRows, 'output_links' => $inputsAndOutputs['outputs']);
+    
+    if(array_key_exists('status_only', $args))
+      {
+      return $jobstatuses;
+      }
+    else
+      {
+      $pipelineComponent = MidasLoader::loadComponent('Pipeline', 'pyslicer');
+      $conditionRows = $pipelineComponent->formatJobCondition($job->getCondition());
+      $inputsAndOutputs = $pipelineComponent->resolveInputsAndOutputs($job);
+      return array('job' => $job, 'jobstatuses' => $jobstatuses, 'condition_rows' => $conditionRows, 'output_links' => $inputsAndOutputs['outputs']);
+      }
     }
 
 

controllers/components/PipelineComponent.php

@@ -59,8 +59,8 @@ function init()
   function segmentationInputLinks($job, $inputs, $outputs, $midasPath)
     {
     $inputItemId = $inputs[0]->getItemId();
-    $volumeView = $midasPath . '/visualize/paraview/slice?itemId='.$inputItemId;
-    $sliceView = $midasPath . '/visualize/paraview/slice?itemId='.$inputItemId;
+    $volumeView = $midasPath . '/pvw/paraview/volume?itemId='.$inputItemId;
+    $sliceView = $midasPath . '/pvw/paraview/slice?itemId='.$inputItemId;
 
     return array( array ('text' => 'slice view', 'url' => $sliceView),
                   array ('text' => 'volume view', 'url' => $volumeView));
@@ -71,9 +71,9 @@ function segmentationOutputLinks($job, $inputs, $outputs, $midasPath)
     $inputItemId = $inputs[0]->getItemId();
     $outputItemId = $outputs[0]->getItemId();
 
-    $meshView = $midasPath . '/visualize/paraview/surface?itemId='.$outputItemId;
-    $sliceView = $midasPath . '/visualize/paraview/slice?itemId='.$inputItemId.'&meshes='.$outputItemId.'&jsImports='.$midasPath.'/modules/pyslicer/public/js/lib/visualize.meshView.js';
-    $volumeView = $midasPath . '/visualize/paraview/volume?itemId='.$inputItemId.'&meshes='.$outputItemId.'&jsImports='.$midasPath.'/modules/pyslicer/public/js/lib/visualize.meshView.js';
+    $meshView = $midasPath . '/pvw/paraview/surface?itemId='.$outputItemId;
+    $sliceView = $midasPath . '/pvw/paraview/slice?itemId='.$inputItemId.'&meshes='.$outputItemId.'&jsImports='.$midasPath.'/modules/pyslicer/public/js/lib/visualize.meshView.js';
+    $volumeView = $midasPath . '/pvw/paraview/volume?itemId='.$inputItemId.'&meshes='.$outputItemId.'&jsImports='.$midasPath.'/modules/pyslicer/public/js/lib/visualize.meshView.js';
 
     return array( array ('text' => 'model mesh view', 'url' => $meshView),
                   array ('text' => 'slice view', 'url' => $sliceView),