1. Visualizatin is now dependency of Preprocessing.

2. All the common libraries put into OpenCyto (loaded in Preprocessing).
RGLab · Oct 9, 2012 · 33ea01d · 33ea01d
1 parent 59ad656
commit 33ea01d
Show file tree

Hide file tree

Showing 58 changed files with 94 additions and 4,210 deletions.
diff --git a/module.properties b/module.properties
@@ -2,4 +2,4 @@ Name: OpenCytoVisualization
 ModuleClass: org.labkey.api.module.SimpleModule
 RequiredServerVersion: 12.10
 Version: 0.01
-ModuleDependencies: Flow
+ModuleDependencies: OpenCytoPreprocessing
diff --git a/src/queries/flow/FilePaths.query.xml b/src/queries/flow/FilePaths.query.xml
diff --git a/src/queries/flow/FilePaths.sql b/src/queries/flow/FilePaths.sql
diff --git a/src/queries/flow/Keyword.query.xml b/src/queries/flow/Keyword.query.xml
diff --git a/src/queries/flow/Keyword.sql b/src/queries/flow/Keyword.sql
diff --git a/src/queries/flow/RootPath.query.xml b/src/queries/flow/RootPath.query.xml
diff --git a/src/queries/flow/RootPath.sql b/src/queries/flow/RootPath.sql
diff --git a/src/queries/opencyto_preprocessing/GatingSet.query.xml b/src/queries/opencyto_preprocessing/GatingSet.query.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<query name="GatingSet" schemaName="opencyto_preprocessing" xmlns="http://labkey.org/data/xml/query"/>
diff --git a/src/queries/opencyto_preprocessing/GatingSet.sql b/src/queries/opencyto_preprocessing/GatingSet.sql
@@ -0,0 +1,5 @@
+SELECT
+  gsname AS Name,
+  objlink AS Path
+FROM
+  gstbl
diff --git a/src/queries/qualifier/GatingSet.query.xml b/src/queries/qualifier/GatingSet.query.xml
diff --git a/src/queries/qualifier/GatingSet.sql b/src/queries/qualifier/GatingSet.sql
diff --git a/src/views/begin.view.xml b/src/views/begin.view.xml
@@ -1,19 +1,21 @@
 <view xmlns="http://labkey.org/data/xml/view" title="OpenCyto Visualization">
     <dependencies>
         <dependency path='Ext.ux.form.LovCombo.css'/>
-        <dependency path='OpenCytoVisualization/jQuery/css/base/jquery-ui.css'/>
-        <dependency path='OpenCytoVisualization/SuperBoxSelect/superboxselect-gray-extend.css'/>
-        <dependency path='OpenCytoVisualization.css'/>
+        <dependency path='OpenCyto/OpenCyto.css'/>
+        <dependency path='OpenCyto/jQuery/css/base/jquery-ui.css'/>
+        <dependency path='OpenCyto/SuperBoxSelect/superboxselect-gray-extend.css'/>
         <dependency path='Ext.ux.form.LovCombo.js'/>
-        <dependency path='OpenCytoVisualization/ResizableCombo.js'/>
-        <dependency path='OpenCytoVisualization/ResizableLovCombo.js'/>
-        <dependency path='OpenCytoVisualization/SuperBoxSelect/SuperBoxSelect.js'/>
-        <dependency path='OpenCytoVisualization/GridPanelHeaderResize.js'/>
-        <dependency path='OpenCytoVisualization/ColumnModelChromePatch.js'/>
-        <!--<dependency path='OpenCytoVisualization/FitToParent.js'/>-->
+        <dependency path='OpenCyto/ResizableCombo.js'/>
+        <dependency path='OpenCyto/ResizableLovCombo.js'/>
+        <dependency path='OpenCyto/SuperBoxSelect/SuperBoxSelect.js'/>
+        <dependency path='OpenCyto/GridPanelHeaderResize.js'/>
+        <dependency path='OpenCyto/ColumnModelChromePatch.js'/>
+
         <dependency path='OpenCytoVisualization.js'/>
     </dependencies>
 </view>
 
-        <!--LABKEY.requiresCss('SearchBox/Ext.ux.form.SearchBox.css');-->
-        <!--LABKEY.requiresCss('ExtendedComboBox/Ext.ux.form.ExtendedComboBox.css');-->
+        <!--'SearchBox/Ext.ux.form.SearchBox.css'-->
+        <!--'ExtendedComboBox/Ext.ux.form.ExtendedComboBox.css'-->
+        <!--'SearchBox/Ext.ux.form.SearchBox.js',-->
+        <!--'ExtendedComboBox/Ext.ux.form.ExtendedComboBox.js'-->
diff --git a/src/web/OpenCytoVisualization.css b/src/web/OpenCytoVisualization.css
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8"?>
		<query name="GatingSet" schemaName="opencyto_preprocessing" xmlns="http://labkey.org/data/xml/query"/>