Browse code

Updated to Fusion 1.0.8. I have only tested it on my powerbook and on Shadowfax and furthermore I have only tested that it installs - no actual read and/or write tests. We (perhaps me?) should add a test suite using some binary CELs and CDFs.

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/affxparser@20919 bc3139a8-67e5-0310-9ffc-ced21a209358

Kasper D. Hansen authored on 31/10/2006 18:36:39
Showing 342 changed files

... ...
@@ -1,6 +1,6 @@
1 1
 Package: affxparser
2
-Version: 1.7.0
3
-Date: 2006-10-25
2
+Version: 1.7.1
3
+Date: 2006-10-31
4 4
 Title: Affymetrix File Parsing SDK
5 5
 Author: Henrik Bengtsson, James Bullard, Kasper Daniel Hansen
6 6
 Maintainer: Kasper Daniel Hansen <khansen@stat.berkeley.edu>
... ...
@@ -77,6 +77,7 @@ SOURCES.fusion = \
77 77
 	fusion_sdk/file/CELFileData.cpp\
78 78
 	fusion_sdk/file/CELFileWriter.cpp\
79 79
 	fusion_sdk/file/BPMAPFileData.cpp\
80
+	fusion_sdk/file/BPMAPFileWriter.cpp\
80 81
 	fusion_sdk/file/FileIO.cpp\
81 82
 	fusion_sdk/file/FileWriter.cpp\
82 83
 
... ...
@@ -1,3 +1,5 @@
1
-Using Fusion SDK release 1.0.7 from July 2006.
1
+Using Fusion SDK release 1.0.8 from Spetember 2006.
2 2
 
3
-The fusion2affxparser.sh script was used to trim the SDK.
3
+The fusion2affxparser.sh script was used to trim the SDK. 
4
+In addition we changed file/CELFileData.h to allow for compiling
5
+using gcc-4.0.3 supplied with R-2.4.0
... ...
@@ -16,3 +16,6 @@ rm -R TestDataFiles file_formats interface_docs java \
16 16
  calvin_files/utils/test calvin_files/utils/data\
17 17
  calvin_files/writers/test calvin_files/writers/data
18 18
 cd -
19
+diff -rq sdk /Users/kdh/Work/bioc/affxparser/src/fusion_sdk | grep Only | grep -v svn
20
+
21
+
... ...
@@ -1,22 +1,22 @@
1
-/////////////////////////////////////////////////////////////////
1
+////////////////////////////////////////////////////////////////
2 2
 //
3 3
 // Copyright (C) 2005 Affymetrix, Inc.
4 4
 //
5 5
 // This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
10 9
 // This library is distributed in the hope that it will be useful, but
11 10
 // WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12 11
 // or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13 12
 // for more details.
14
-//
13
+// 
15 14
 // You should have received a copy of the GNU Lesser General Public License
16 15
 // along with this library; if not, write to the Free Software Foundation, Inc.,
17 16
 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18 17
 //
19
-/////////////////////////////////////////////////////////////////
18
+////////////////////////////////////////////////////////////////
19
+
20 20
 
21 21
 #include "ArrayAttributes.h"
22 22
 
... ...
@@ -1,22 +1,22 @@
1
-/////////////////////////////////////////////////////////////////
1
+////////////////////////////////////////////////////////////////
2 2
 //
3 3
 // Copyright (C) 2005 Affymetrix, Inc.
4 4
 //
5 5
 // This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
10 9
 // This library is distributed in the hope that it will be useful, but
11 10
 // WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12 11
 // or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13 12
 // for more details.
14
-//
13
+// 
15 14
 // You should have received a copy of the GNU Lesser General Public License
16 15
 // along with this library; if not, write to the Free Software Foundation, Inc.,
17 16
 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18 17
 //
19
-/////////////////////////////////////////////////////////////////
18
+////////////////////////////////////////////////////////////////
19
+
20 20
 
21 21
 #ifndef _ArrayAttributes_HEADER_
22 22
 #define _ArrayAttributes_HEADER_
... ...
@@ -1,52 +1,52 @@
1
-/////////////////////////////////////////////////////////////////
2
-//
3
-// Copyright (C) 2005 Affymetrix, Inc.
4
-//
5
-// This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
10
-// This library is distributed in the hope that it will be useful, but
11
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13
-// for more details.
14
-//
15
-// You should have received a copy of the GNU Lesser General Public License
16
-// along with this library; if not, write to the Free Software Foundation, Inc.,
17
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18
-//
19
-/////////////////////////////////////////////////////////////////
20
-
21
-#include "ArrayAudit.h"
22
-
23
-using namespace affymetrix_calvin_array;
24
-
25
-/*
26
- * Initialize the class.
27
- */
28
-ArrayAuditEntry::ArrayAuditEntry()
29
-{
30
-}
31
-
32
-/*
33
- * Clean up.
34
- */
35
-ArrayAuditEntry::~ArrayAuditEntry()
36
-{
37
-	Clear();
38
-}
39
-
40
-/*!
41
- * Clears each member.
42
- */
43
-void ArrayAuditEntry::Clear()
44
-{
45
-	userName = L"";
46
-	actionType = "";
47
-	arrayGuid = "";
48
-	inputFileGuids.clear(); 	 
49
-	outputFileGuids.clear();
50
-	actionParameters.clear();
51
-	actionDateTime.Clear();
52
-}
1
+////////////////////////////////////////////////////////////////
2
+//
3
+// Copyright (C) 2005 Affymetrix, Inc.
4
+//
5
+// This library is free software; you can redistribute it and/or modify
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
9
+// This library is distributed in the hope that it will be useful, but
10
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12
+// for more details.
13
+// 
14
+// You should have received a copy of the GNU Lesser General Public License
15
+// along with this library; if not, write to the Free Software Foundation, Inc.,
16
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
17
+//
18
+////////////////////////////////////////////////////////////////
19
+
20
+
21
+#include "ArrayAudit.h"
22
+
23
+using namespace affymetrix_calvin_array;
24
+
25
+/*
26
+ * Initialize the class.
27
+ */
28
+ArrayAuditEntry::ArrayAuditEntry()
29
+{
30
+}
31
+
32
+/*
33
+ * Clean up.
34
+ */
35
+ArrayAuditEntry::~ArrayAuditEntry()
36
+{
37
+	Clear();
38
+}
39
+
40
+/*!
41
+ * Clears each member.
42
+ */
43
+void ArrayAuditEntry::Clear()
44
+{
45
+	userName = L"";
46
+	actionType = "";
47
+	arrayGuid = "";
48
+	inputFileGuids.clear(); 	 
49
+	outputFileGuids.clear();
50
+	actionParameters.clear();
51
+	actionDateTime.Clear();
52
+}
... ...
@@ -1,124 +1,124 @@
1
-/////////////////////////////////////////////////////////////////
2
-//
3
-// Copyright (C) 2005 Affymetrix, Inc.
4
-//
5
-// This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
10
-// This library is distributed in the hope that it will be useful, but
11
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13
-// for more details.
14
-//
15
-// You should have received a copy of the GNU Lesser General Public License
16
-// along with this library; if not, write to the Free Software Foundation, Inc.,
17
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18
-//
19
-/////////////////////////////////////////////////////////////////
20
-
21
-#ifndef _ArrayAudit_HEADER_
22
-#define _ArrayAudit_HEADER_
23
-
24
-/*! \file ArrayAudit.h This file provides interfaces for an audit item in an array file.
25
- */
26
-
27
-#include "AffymetrixBaseTypes.h"
28
-#include "AffymetrixGuid.h"
29
-#include "Parameter.h"
30
-#include "DateTime.h"
31
-#include <string>
32
-#include <list>
33
-
34
-namespace affymetrix_calvin_array
35
-{
36
-
37
-/*! A class to store an audit entry associated with an array. */
38
-class ArrayAuditEntry
39
-{
40
-public:
41
-	/*! Constructor */
42
-	ArrayAuditEntry();
43
-
44
-	/*! Destructor */
45
-	~ArrayAuditEntry();
46
-
47
-protected:
48
-	/*! The user name creating the audit entry. */
49
-	std::wstring userName;
50
-
51
-	/*! The type of action being performed. */
52
-	affymetrix_calvin_utilities::AffymetrixGuidType actionType;
53
-
54
-	/*! The guid to the physical array associated with the action. */ 	 
55
-	affymetrix_calvin_utilities::AffymetrixGuidType arrayGuid; 	 
56
-
57
-	/*! A list of guids for the input file ids to the action. */ 	 
58
-	affymetrix_calvin_utilities::AffymetrixGuidTypeList inputFileGuids; 	 
59
-
60
-	/*! A list of guids for the output file ids from the action. */ 	 
61
-	affymetrix_calvin_utilities::AffymetrixGuidTypeList outputFileGuids; 	 
62
-
63
-	/*! A list of parameters associated with the action. */
64
-	affymetrix_calvin_parameter::ParameterNameValuePairList actionParameters;
65
-
66
-	/*! The date and time of the action. */
67
-	affymetrix_calvin_utilities::DateTime actionDateTime;
68
-
69
-public:
70
-	/*! The user name associated with the audit entry.
71
-	 *
72
-	 * @return The user name associated with the audit entry.
73
-	 */
74
-	std::wstring &UserName() { return userName; }
75
-
76
-	/*! The date and time of the action.
77
-	 *
78
-	 * @return The date and time of the action.
79
-	 */
80
-	affymetrix_calvin_utilities::DateTime &DateTime() { return actionDateTime; }
81
-
82
-	/*! The type of action.
83
-	 *
84
-	 * @return The type of action.
85
-	 */
86
-	affymetrix_calvin_utilities::AffymetrixGuidType &ActionType() { return actionType; }
87
-
88
-	/*! The id of the physical array associated with the action.
89
-	 *
90
-	 * @return The physical array id.
91
-	 */
92
-	affymetrix_calvin_utilities::AffymetrixGuidType &ArrayGuid() { return arrayGuid; }
93
-
94
-	/*! The list of guids for the input files to the action. 	 
95
-	* 	 
96
-	* @return  The list of guids for the input files to the action. 	 
97
-	*/ 	 
98
-	affymetrix_calvin_utilities::AffymetrixGuidTypeList &InputFileGuids() { return inputFileGuids; } 	 
99
-
100
-	/*! The list of guids for the input files to the action. 	 
101
-	* 	 
102
-	* @return  The list of guids for the output files of the action. 	 
103
-	*/ 	 
104
-	affymetrix_calvin_utilities::AffymetrixGuidTypeList &OutputFileGuids() { return outputFileGuids; }
105
-
106
-	/*! The list of parameters associated with the action.
107
-	 *
108
-	 * @return The list of parameters associated with the action.
109
-	 */
110
-	affymetrix_calvin_parameter::ParameterNameValuePairList &ActionParameters() { return actionParameters; }
111
-
112
-	/*! Clears the member objects. */
113
-	void Clear();
114
-};
115
-
116
-/*! An STL vector of tbd objects */
117
-typedef std::vector<ArrayAuditEntry> ArrayAuditEntryVector;
118
-
119
-/*! An STL list of tbd objects */
120
-typedef std::list<ArrayAuditEntry> ArrayAuditEntryList;
121
-
122
-};
123
-
124
-#endif // _ArrayAudit_HEADER_
1
+////////////////////////////////////////////////////////////////
2
+//
3
+// Copyright (C) 2005 Affymetrix, Inc.
4
+//
5
+// This library is free software; you can redistribute it and/or modify
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
9
+// This library is distributed in the hope that it will be useful, but
10
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12
+// for more details.
13
+// 
14
+// You should have received a copy of the GNU Lesser General Public License
15
+// along with this library; if not, write to the Free Software Foundation, Inc.,
16
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
17
+//
18
+////////////////////////////////////////////////////////////////
19
+
20
+
21
+#ifndef _ArrayAudit_HEADER_
22
+#define _ArrayAudit_HEADER_
23
+
24
+/*! \file ArrayAudit.h This file provides interfaces for an audit item in an array file.
25
+ */
26
+
27
+#include "AffymetrixBaseTypes.h"
28
+#include "AffymetrixGuid.h"
29
+#include "Parameter.h"
30
+#include "DateTime.h"
31
+#include <string>
32
+#include <list>
33
+
34
+namespace affymetrix_calvin_array
35
+{
36
+
37
+/*! A class to store an audit entry associated with an array. */
38
+class ArrayAuditEntry
39
+{
40
+public:
41
+	/*! Constructor */
42
+	ArrayAuditEntry();
43
+
44
+	/*! Destructor */
45
+	~ArrayAuditEntry();
46
+
47
+protected:
48
+	/*! The user name creating the audit entry. */
49
+	std::wstring userName;
50
+
51
+	/*! The type of action being performed. */
52
+	affymetrix_calvin_utilities::AffymetrixGuidType actionType;
53
+
54
+	/*! The guid to the physical array associated with the action. */ 	 
55
+	affymetrix_calvin_utilities::AffymetrixGuidType arrayGuid; 	 
56
+
57
+	/*! A list of guids for the input file ids to the action. */ 	 
58
+	affymetrix_calvin_utilities::AffymetrixGuidTypeList inputFileGuids; 	 
59
+
60
+	/*! A list of guids for the output file ids from the action. */ 	 
61
+	affymetrix_calvin_utilities::AffymetrixGuidTypeList outputFileGuids; 	 
62
+
63
+	/*! A list of parameters associated with the action. */
64
+	affymetrix_calvin_parameter::ParameterNameValuePairList actionParameters;
65
+
66
+	/*! The date and time of the action. */
67
+	affymetrix_calvin_utilities::DateTime actionDateTime;
68
+
69
+public:
70
+	/*! The user name associated with the audit entry.
71
+	 *
72
+	 * @return The user name associated with the audit entry.
73
+	 */
74
+	std::wstring &UserName() { return userName; }
75
+
76
+	/*! The date and time of the action.
77
+	 *
78
+	 * @return The date and time of the action.
79
+	 */
80
+	affymetrix_calvin_utilities::DateTime &DateTime() { return actionDateTime; }
81
+
82
+	/*! The type of action.
83
+	 *
84
+	 * @return The type of action.
85
+	 */
86
+	affymetrix_calvin_utilities::AffymetrixGuidType &ActionType() { return actionType; }
87
+
88
+	/*! The id of the physical array associated with the action.
89
+	 *
90
+	 * @return The physical array id.
91
+	 */
92
+	affymetrix_calvin_utilities::AffymetrixGuidType &ArrayGuid() { return arrayGuid; }
93
+
94
+	/*! The list of guids for the input files to the action. 	 
95
+	* 	 
96
+	* @return  The list of guids for the input files to the action. 	 
97
+	*/ 	 
98
+	affymetrix_calvin_utilities::AffymetrixGuidTypeList &InputFileGuids() { return inputFileGuids; } 	 
99
+
100
+	/*! The list of guids for the input files to the action. 	 
101
+	* 	 
102
+	* @return  The list of guids for the output files of the action. 	 
103
+	*/ 	 
104
+	affymetrix_calvin_utilities::AffymetrixGuidTypeList &OutputFileGuids() { return outputFileGuids; }
105
+
106
+	/*! The list of parameters associated with the action.
107
+	 *
108
+	 * @return The list of parameters associated with the action.
109
+	 */
110
+	affymetrix_calvin_parameter::ParameterNameValuePairList &ActionParameters() { return actionParameters; }
111
+
112
+	/*! Clears the member objects. */
113
+	void Clear();
114
+};
115
+
116
+/*! An STL vector of tbd objects */
117
+typedef std::vector<ArrayAuditEntry> ArrayAuditEntryVector;
118
+
119
+/*! An STL list of tbd objects */
120
+typedef std::list<ArrayAuditEntry> ArrayAuditEntryList;
121
+
122
+};
123
+
124
+#endif // _ArrayAudit_HEADER_
... ...
@@ -1,46 +1,46 @@
1
-/////////////////////////////////////////////////////////////////
2
-//
3
-// Copyright (C) 2005 Affymetrix, Inc.
4
-//
5
-// This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
10
-// This library is distributed in the hope that it will be useful, but
11
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13
-// for more details.
14
-//
15
-// You should have received a copy of the GNU Lesser General Public License
16
-// along with this library; if not, write to the Free Software Foundation, Inc.,
17
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18
-//
19
-/////////////////////////////////////////////////////////////////
20
-
21
-#ifndef _ArrayAuditActionTypes_HEADER_
22
-#define _ArrayAuditActionTypes_HEADER_
23
-
24
-/*! \file ArrayAuditActionTypes.h Defines constants for various array file audit actions.
25
- */
26
-
27
-#include "AffymetrixBaseTypes.h"
28
-
29
-namespace affymetrix_calvin_array
30
-{
31
-
32
-/*! Initial creation of an array file. */
33
-static const int32_t ARRAY_FILE_CREATEION_ACTION = 1;
34
-
35
-/*! Attribute update action. */
36
-static const int32_t ARRAY_FILE_ATTRIBUTE_UPDATE_ACTION = 2;
37
-
38
-/*! Fluidics instrument control action. */
39
-static const int32_t FLUIDICS_INSTRUMENT_CONTROL_ACTION = 3;
40
-
41
-/*! Scanner instrument control action. */
42
-static const int32_t SCAN_INSTRUMENT_CONTROL_ACTION = 4;
43
-
44
-};
45
-
46
-#endif // _ArrayAuditActionTypes_HEADER_
1
+////////////////////////////////////////////////////////////////
2
+//
3
+// Copyright (C) 2005 Affymetrix, Inc.
4
+//
5
+// This library is free software; you can redistribute it and/or modify
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
9
+// This library is distributed in the hope that it will be useful, but
10
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12
+// for more details.
13
+// 
14
+// You should have received a copy of the GNU Lesser General Public License
15
+// along with this library; if not, write to the Free Software Foundation, Inc.,
16
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
17
+//
18
+////////////////////////////////////////////////////////////////
19
+
20
+
21
+#ifndef _ArrayAuditActionTypes_HEADER_
22
+#define _ArrayAuditActionTypes_HEADER_
23
+
24
+/*! \file ArrayAuditActionTypes.h Defines constants for various array file audit actions.
25
+ */
26
+
27
+#include "AffymetrixBaseTypes.h"
28
+
29
+namespace affymetrix_calvin_array
30
+{
31
+
32
+/*! Initial creation of an array file. */
33
+static const int32_t ARRAY_FILE_CREATEION_ACTION = 1;
34
+
35
+/*! Attribute update action. */
36
+static const int32_t ARRAY_FILE_ATTRIBUTE_UPDATE_ACTION = 2;
37
+
38
+/*! Fluidics instrument control action. */
39
+static const int32_t FLUIDICS_INSTRUMENT_CONTROL_ACTION = 3;
40
+
41
+/*! Scanner instrument control action. */
42
+static const int32_t SCAN_INSTRUMENT_CONTROL_ACTION = 4;
43
+
44
+};
45
+
46
+#endif // _ArrayAuditActionTypes_HEADER_
... ...
@@ -1,53 +1,53 @@
1
-/////////////////////////////////////////////////////////////////
2
-//
3
-// Copyright (C) 2005 Affymetrix, Inc.
4
-//
5
-// This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
10
-// This library is distributed in the hope that it will be useful, but
11
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13
-// for more details.
14
-//
15
-// You should have received a copy of the GNU Lesser General Public License
16
-// along with this library; if not, write to the Free Software Foundation, Inc.,
17
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18
-//
19
-/////////////////////////////////////////////////////////////////
20
-
21
-#include "ArrayData.h"
22
-
23
-using namespace affymetrix_calvin_array;
24
-
25
-/*
26
- * Initialize the class.
27
- */
28
-ArrayData::ArrayData()
29
-{
30
-}
31
-
32
-/*
33
- * Clean up.
34
- */
35
-ArrayData::~ArrayData()
36
-{
37
-	Clear();
38
-}
39
-
40
-/*
41
- * Clears the member variables.
42
- */
43
-void ArrayData::Clear()
44
-{
45
-	physicalArraysAttributes.clear();
46
-	userAttributes.clear();
47
-	fileId="";
48
-	dataTypeId="";
49
-	createdStep=NoStep;
50
-	initialProject=L"";
51
-	creationDateTime=L"";
52
-	createdBy=L"";
53
-}
1
+////////////////////////////////////////////////////////////////
2
+//
3
+// Copyright (C) 2005 Affymetrix, Inc.
4
+//
5
+// This library is free software; you can redistribute it and/or modify
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
9
+// This library is distributed in the hope that it will be useful, but
10
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12
+// for more details.
13
+// 
14
+// You should have received a copy of the GNU Lesser General Public License
15
+// along with this library; if not, write to the Free Software Foundation, Inc.,
16
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
17
+//
18
+////////////////////////////////////////////////////////////////
19
+
20
+
21
+#include "ArrayData.h"
22
+
23
+using namespace affymetrix_calvin_array;
24
+
25
+/*
26
+ * Initialize the class.
27
+ */
28
+ArrayData::ArrayData()
29
+{
30
+}
31
+
32
+/*
33
+ * Clean up.
34
+ */
35
+ArrayData::~ArrayData()
36
+{
37
+	Clear();
38
+}
39
+
40
+/*
41
+ * Clears the member variables.
42
+ */
43
+void ArrayData::Clear()
44
+{
45
+	physicalArraysAttributes.clear();
46
+	userAttributes.clear();
47
+	fileId="";
48
+	dataTypeId="";
49
+	createdStep=NoStep;
50
+	initialProject=L"";
51
+	creationDateTime=L"";
52
+	createdBy=L"";
53
+}
... ...
@@ -1,121 +1,121 @@
1
-/////////////////////////////////////////////////////////////////
2
-//
3
-// Copyright (C) 2005 Affymetrix, Inc.
4
-//
5
-// This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
10
-// This library is distributed in the hope that it will be useful, but
11
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13
-// for more details.
14
-//
15
-// You should have received a copy of the GNU Lesser General Public License
16
-// along with this library; if not, write to the Free Software Foundation, Inc.,
17
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18
-//
19
-/////////////////////////////////////////////////////////////////
20
-
21
-#ifndef _ArrayData_HEADER_
22
-#define _ArrayData_HEADER_
23
-
24
-/*! \file ArrayData.h This file provides interfaces to store information in an array file.
25
- */
26
-
27
-#include "ArrayId.h"
28
-#include "AffymetrixBaseTypes.h"
29
-#include "AffymetrixGuid.h"
30
-#include "Parameter.h"
31
-#include "ParameterNameValueType.h"
32
-#include "ArrayAttributes.h"
33
-#include <string>
34
-
35
-namespace affymetrix_calvin_array
36
-{
37
-
38
-/*! This class provides interfaces to store array information. */
39
-class ArrayData
40
-{
41
-public:
42
-	/*! Constructor */
43
-	ArrayData();
44
-
45
-	/*! Destructor */
46
-	~ArrayData();
47
-
48
-protected:
49
-	/*! A unique idendifier for the array set object */
50
-	affymetrix_calvin_utilities::AffymetrixGuidType fileId;
51
-
52
-	/*! An identifier to the type of data stored in the file */
53
-	affymetrix_calvin_utilities::AffymetrixGuidType dataTypeId;
54
-
55
-	/*! The step in Calvin that created the array set data. */
56
-	CreateStep createdStep;
57
-
58
-	/*! The name of the project that initially created the array set data. */
59
-	std::wstring initialProject;
60
-
61
-	/*! The date and time of initial creation. */
62
-	std::wstring creationDateTime;
63
-
64
-	/*! The user who created the data object. */
65
-	std::wstring createdBy;
66
-
67
-	/*! The arrays attributes for the arrays in the set */
68
-	ArrayAttributesVector physicalArraysAttributes;
69
-
70
-	/*! The user attributes */
71
-	affymetrix_calvin_parameter::ParameterNameValueDefaultRequiredTypeList userAttributes;
72
-
73
-public:
74
-
75
-	/*! The unique idendifier for the array set.
76
-	 * @return The unique idendifier for the array set.
77
-	 */
78
-	affymetrix_calvin_utilities::AffymetrixGuidType &ArraySetFileIdentifier() { return fileId; }
79
-
80
-	/*! The identifier of the type of data stored in the file.
81
-	 * @return The identifier of the type of data.
82
-	 */
83
-	affymetrix_calvin_utilities::AffymetrixGuidType &DataTypeIdentifier() { return dataTypeId; }
84
-
85
-	/*! The step in Calvin that created the array set data.
86
-	 * @return The step in calvin that create the array set data.
87
-	 */
88
-	CreateStep &CreatedStep() { return createdStep; }
89
-
90
-	/*! The name of the project that initially created the array set data.
91
-	 * @return The project name.
92
-	 */
93
-	std::wstring &InitialProject() { return initialProject; }
94
-
95
-	/*! The date and time of initial creation.
96
-	 * @return The creation date and time.
97
-	 */
98
-	std::wstring &CreationDateTime() { return creationDateTime; }
99
-
100
-	/*! The user who created the data object.
101
-	 * @return The user name.
102
-	 */
103
-	std::wstring &CreatedBy() { return createdBy; }
104
-
105
-	/*! The arrays attributes. Each array in a set will have its own attributes.
106
-	 * @return The vector of arrays attributes.
107
-	 */
108
-	ArrayAttributesVector &PhysicalArraysAttributes() { return physicalArraysAttributes; }
109
-
110
-	/*! The user attributes.
111
-	 * @return The vector of user attributes.
112
-	 */
113
-	affymetrix_calvin_parameter::ParameterNameValueDefaultRequiredTypeList &UserAttributes() { return userAttributes; }
114
-
115
-	/*! Clears the member objects. */
116
-	void Clear();
117
-};
118
-
119
-};
120
-
121
-#endif // _ArrayData_HEADER_
1
+////////////////////////////////////////////////////////////////
2
+//
3
+// Copyright (C) 2005 Affymetrix, Inc.
4
+//
5
+// This library is free software; you can redistribute it and/or modify
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
9
+// This library is distributed in the hope that it will be useful, but
10
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12
+// for more details.
13
+// 
14
+// You should have received a copy of the GNU Lesser General Public License
15
+// along with this library; if not, write to the Free Software Foundation, Inc.,
16
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
17
+//
18
+////////////////////////////////////////////////////////////////
19
+
20
+
21
+#ifndef _ArrayData_HEADER_
22
+#define _ArrayData_HEADER_
23
+
24
+/*! \file ArrayData.h This file provides interfaces to store information in an array file.
25
+ */
26
+
27
+#include "ArrayId.h"
28
+#include "AffymetrixBaseTypes.h"
29
+#include "AffymetrixGuid.h"
30
+#include "Parameter.h"
31
+#include "ParameterNameValueType.h"
32
+#include "ArrayAttributes.h"
33
+#include <string>
34
+
35
+namespace affymetrix_calvin_array
36
+{
37
+
38
+/*! This class provides interfaces to store array information. */
39
+class ArrayData
40
+{
41
+public:
42
+	/*! Constructor */
43
+	ArrayData();
44
+
45
+	/*! Destructor */
46
+	~ArrayData();
47
+
48
+protected:
49
+	/*! A unique idendifier for the array set object */
50
+	affymetrix_calvin_utilities::AffymetrixGuidType fileId;
51
+
52
+	/*! An identifier to the type of data stored in the file */
53
+	affymetrix_calvin_utilities::AffymetrixGuidType dataTypeId;
54
+
55
+	/*! The step in Calvin that created the array set data. */
56
+	CreateStep createdStep;
57
+
58
+	/*! The name of the project that initially created the array set data. */
59
+	std::wstring initialProject;
60
+
61
+	/*! The date and time of initial creation. */
62
+	std::wstring creationDateTime;
63
+
64
+	/*! The user who created the data object. */
65
+	std::wstring createdBy;
66
+
67
+	/*! The arrays attributes for the arrays in the set */
68
+	ArrayAttributesVector physicalArraysAttributes;
69
+
70
+	/*! The user attributes */
71
+	affymetrix_calvin_parameter::ParameterNameValueDefaultRequiredTypeList userAttributes;
72
+
73
+public:
74
+
75
+	/*! The unique idendifier for the array set.
76
+	 * @return The unique idendifier for the array set.
77
+	 */
78
+	affymetrix_calvin_utilities::AffymetrixGuidType &ArraySetFileIdentifier() { return fileId; }
79
+
80
+	/*! The identifier of the type of data stored in the file.
81
+	 * @return The identifier of the type of data.
82
+	 */
83
+	affymetrix_calvin_utilities::AffymetrixGuidType &DataTypeIdentifier() { return dataTypeId; }
84
+
85
+	/*! The step in Calvin that created the array set data.
86
+	 * @return The step in calvin that create the array set data.
87
+	 */
88
+	CreateStep &CreatedStep() { return createdStep; }
89
+
90
+	/*! The name of the project that initially created the array set data.
91
+	 * @return The project name.
92
+	 */
93
+	std::wstring &InitialProject() { return initialProject; }
94
+
95
+	/*! The date and time of initial creation.
96
+	 * @return The creation date and time.
97
+	 */
98
+	std::wstring &CreationDateTime() { return creationDateTime; }
99
+
100
+	/*! The user who created the data object.
101
+	 * @return The user name.
102
+	 */
103
+	std::wstring &CreatedBy() { return createdBy; }
104
+
105
+	/*! The arrays attributes. Each array in a set will have its own attributes.
106
+	 * @return The vector of arrays attributes.
107
+	 */
108
+	ArrayAttributesVector &PhysicalArraysAttributes() { return physicalArraysAttributes; }
109
+
110
+	/*! The user attributes.
111
+	 * @return The vector of user attributes.
112
+	 */
113
+	affymetrix_calvin_parameter::ParameterNameValueDefaultRequiredTypeList &UserAttributes() { return userAttributes; }
114
+
115
+	/*! Clears the member objects. */
116
+	void Clear();
117
+};
118
+
119
+};
120
+
121
+#endif // _ArrayData_HEADER_
... ...
@@ -1,22 +1,22 @@
1
-/////////////////////////////////////////////////////////////////
1
+////////////////////////////////////////////////////////////////
2 2
 //
3 3
 // Copyright (C) 2005 Affymetrix, Inc.
4 4
 //
5 5
 // This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
10 9
 // This library is distributed in the hope that it will be useful, but
11 10
 // WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12 11
 // or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13 12
 // for more details.
14
-//
13
+// 
15 14
 // You should have received a copy of the GNU Lesser General Public License
16 15
 // along with this library; if not, write to the Free Software Foundation, Inc.,
17 16
 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18 17
 //
19
-/////////////////////////////////////////////////////////////////
18
+////////////////////////////////////////////////////////////////
19
+
20 20
 
21 21
 #ifndef _ArrayId_HEADER_
22 22
 #define _ArrayId_HEADER_
... ...
@@ -1,65 +1,65 @@
1
-/////////////////////////////////////////////////////////////////
2
-//
3
-// Copyright (C) 2005 Affymetrix, Inc.
4
-//
5
-// This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
10
-// This library is distributed in the hope that it will be useful, but
11
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13
-// for more details.
14
-//
15
-// You should have received a copy of the GNU Lesser General Public License
16
-// along with this library; if not, write to the Free Software Foundation, Inc.,
17
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18
-//
19
-/////////////////////////////////////////////////////////////////
20
-
21
-#include "ArrayMedia.h"
22
-
23
-using namespace affymetrix_calvin_array;
24
-
25
-/*! The GeneChip cartridge. */
26
-#define MEDIA_TYPE_CARTRIDGE std::wstring(L"Cartridge")
27
-
28
-/*! A 96 well plate or strip. */
29
-#define MEDIA_TYPE_PLATE_OR_STRIP std::wstring(L"PlateOrStrip")
30
-
31
-/*
32
- * Convert the media type to a string.
33
- */
34
-std::wstring affymetrix_calvin_array::MediaToString(ArrayMedia media)
35
-{
36
-	switch (media)
37
-	{
38
-	case CartridgeMedia:
39
-		return MEDIA_TYPE_CARTRIDGE;
40
-		break;
41
-
42
-	case PlateOrStripMedia:
43
-		return MEDIA_TYPE_PLATE_OR_STRIP;
44
-		break;
45
-
46
-	default:
47
-		return L"";
48
-		break;
49
-	}
50
-}
51
-
52
-/*
53
- * Convert the string to media type.
54
- */
55
-ArrayMedia affymetrix_calvin_array::MediaFromString(const std::wstring &media)
56
-{
57
-	if (media == MEDIA_TYPE_CARTRIDGE)
58
-		return CartridgeMedia;
59
-	
60
-	else if (media == MEDIA_TYPE_PLATE_OR_STRIP)
61
-		return PlateOrStripMedia;
62
-
63
-	else
64
-		return CartridgeMedia;
65
-}
1
+////////////////////////////////////////////////////////////////
2
+//
3
+// Copyright (C) 2005 Affymetrix, Inc.
4
+//
5
+// This library is free software; you can redistribute it and/or modify
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
9
+// This library is distributed in the hope that it will be useful, but
10
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12
+// for more details.
13
+// 
14
+// You should have received a copy of the GNU Lesser General Public License
15
+// along with this library; if not, write to the Free Software Foundation, Inc.,
16
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
17
+//
18
+////////////////////////////////////////////////////////////////
19
+
20
+
21
+#include "ArrayMedia.h"
22
+
23
+using namespace affymetrix_calvin_array;
24
+
25
+/*! The GeneChip cartridge. */
26
+#define MEDIA_TYPE_CARTRIDGE std::wstring(L"Cartridge")
27
+
28
+/*! A 96 well plate or strip. */
29
+#define MEDIA_TYPE_PLATE_OR_STRIP std::wstring(L"PlateOrStrip")
30
+
31
+/*
32
+ * Convert the media type to a string.
33
+ */
34
+std::wstring affymetrix_calvin_array::MediaToString(ArrayMedia media)
35
+{
36
+	switch (media)
37
+	{
38
+	case CartridgeMedia:
39
+		return MEDIA_TYPE_CARTRIDGE;
40
+		break;
41
+
42
+	case PlateOrStripMedia:
43
+		return MEDIA_TYPE_PLATE_OR_STRIP;
44
+		break;
45
+
46
+	default:
47
+		return L"";
48
+		break;
49
+	}
50
+}
51
+
52
+/*
53
+ * Convert the string to media type.
54
+ */
55
+ArrayMedia affymetrix_calvin_array::MediaFromString(const std::wstring &media)
56
+{
57
+	if (media == MEDIA_TYPE_CARTRIDGE)
58
+		return CartridgeMedia;
59
+	
60
+	else if (media == MEDIA_TYPE_PLATE_OR_STRIP)
61
+		return PlateOrStripMedia;
62
+
63
+	else
64
+		return CartridgeMedia;
65
+}
... ...
@@ -1,52 +1,52 @@
1
-/////////////////////////////////////////////////////////////////
2
-//
3
-// Copyright (C) 2005 Affymetrix, Inc.
4
-//
5
-// This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
10
-// This library is distributed in the hope that it will be useful, but
11
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13
-// for more details.
14
-//
15
-// You should have received a copy of the GNU Lesser General Public License
16
-// along with this library; if not, write to the Free Software Foundation, Inc.,
17
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18
-//
19
-/////////////////////////////////////////////////////////////////
20
-
21
-#ifndef _ArrayMedia_HEADER_
22
-#define _ArrayMedia_HEADER_
23
-
24
-/*! \file ArrayMedia.h This file a type for defining the media type of an array. */
25
-
26
-#include <string>
27
-
28
-namespace affymetrix_calvin_array
29
-{
30
-
31
-/*! The type of media of the array. */
32
-typedef enum _ArrayMedia
33
-{
34
-	CartridgeMedia,		/*! A GeneChip cartridge. */
35
-	PlateOrStripMedia	/*! A 96 well plate or peg strip. */
36
-} ArrayMedia;
37
-
38
-/*! Converts the media type to a string.
39
- * @param media The media type
40
- * @return The string representation.
41
- */
42
-std::wstring MediaToString(ArrayMedia media);
43
-
44
-/*! Converts a string to media type.
45
- * @param media The string representation.
46
- * @return The media
47
- */
48
-ArrayMedia MediaFromString(const std::wstring &media);
49
-
50
-};
51
-
52
-#endif // _ArrayMedia_HEADER_
1
+////////////////////////////////////////////////////////////////
2
+//
3
+// Copyright (C) 2005 Affymetrix, Inc.
4
+//
5
+// This library is free software; you can redistribute it and/or modify
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
9
+// This library is distributed in the hope that it will be useful, but
10
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12
+// for more details.
13
+// 
14
+// You should have received a copy of the GNU Lesser General Public License
15
+// along with this library; if not, write to the Free Software Foundation, Inc.,
16
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
17
+//
18
+////////////////////////////////////////////////////////////////
19
+
20
+
21
+#ifndef _ArrayMedia_HEADER_
22
+#define _ArrayMedia_HEADER_
23
+
24
+/*! \file ArrayMedia.h This file a type for defining the media type of an array. */
25
+
26
+#include <string>
27
+
28
+namespace affymetrix_calvin_array
29
+{
30
+
31
+/*! The type of media of the array. */
32
+typedef enum _ArrayMedia
33
+{
34
+	CartridgeMedia,		/*! A GeneChip cartridge. */
35
+	PlateOrStripMedia	/*! A 96 well plate or peg strip. */
36
+} ArrayMedia;
37
+
38
+/*! Converts the media type to a string.
39
+ * @param media The media type
40
+ * @return The string representation.
41
+ */
42
+std::wstring MediaToString(ArrayMedia media);
43
+
44
+/*! Converts a string to media type.
45
+ * @param media The string representation.
46
+ * @return The media
47
+ */
48
+ArrayMedia MediaFromString(const std::wstring &media);
49
+
50
+};
51
+
52
+#endif // _ArrayMedia_HEADER_
... ...
@@ -1,136 +1,136 @@
1
-/////////////////////////////////////////////////////////////////
2
-//
3
-// Copyright (C) 2005 Affymetrix, Inc.
4
-//
5
-// This library is free software; you can redistribute it and/or modify
6
-// it under the terms of the GNU Lesser General Public License as published
7
-// by the Free Software Foundation; either version 2.1 of the License,
8
-// or (at your option) any later version.
9
-//
10
-// This library is distributed in the hope that it will be useful, but
11
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
13
-// for more details.
14
-//
15
-// You should have received a copy of the GNU Lesser General Public License
16
-// along with this library; if not, write to the Free Software Foundation, Inc.,
17
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
18
-//
19
-/////////////////////////////////////////////////////////////////
20
-
21
-#include "CreateStep.h"
22
-
23
-using namespace affymetrix_calvin_array;
24
-
25
-/*! The none step. */
26
-#define CREATED_STEP_NONE std::wstring(L"None")
27
-
28
-/*! The array registration step. */
29
-#define CREATED_STEP_ARRAY_REG std::wstring(L"ArrayRegistration")
30
-
31
-/*! The scan step. */
32
-#define CREATED_STEP_SCAN std::wstring(L"Scanning")
33
-
34
-/*! The grid alignment step. */
35
-#define CREATED_STEP_GRID std::wstring(L"Gridding")
36
-
37
-/*! The cel analysis step. */
38
-#define CREATED_STEP_CEL std::wstring(L"CELAnalysis")
39
-
40
-/*! Other undefined step. */
41
-#define CREATED_STEP_OTHER std::wstring(L"Other")
42
-
43
-/*! From step. */
44
-#define CREATED_STEP_FROM std::wstring(L"From")
45
-
46
-/*! Job order step. */
47
-#define CREATED_STEP_JOB_ORDER std::wstring(L"JobOrderServer")
48
-
49
-/*! File indexer step. */
50
-#define CREATED_STEP_FILE_INDEXER std::wstring(L"FileIndexer")
51
-
52
-/*
53
- * Convert the step type to a string.
54
- */
55
-std::wstring affymetrix_calvin_array::CreateStepToString(CreateStep step)
56
-{
57
-	switch (step)
58
-	{
59
-	case NoStep:
60
-		return CREATED_STEP_NONE;
61
-		break;
62
-
63
-	case ArrayRegistrationStep:
64
-		return CREATED_STEP_ARRAY_REG;
65
-		break;
66
-
67
-	case ScanningStep:
68
-		return CREATED_STEP_SCAN;
69
-		break;
70
-
71
-	case GriddingStep:
72
-		return CREATED_STEP_GRID;
73
-		break;
74
-
75
-	case CELAnalysisStep:
76
-		return CREATED_STEP_CEL;
77
-		break;
78
-
79
-	case OtherStep:
80
-		return CREATED_STEP_OTHER;
81
-		break;
82
-
83
-	case FromStep:
84
-		return CREATED_STEP_FROM;
85
-		break;
86
-		
87
-	case JobOrderServerStep:
88
-		return CREATED_STEP_JOB_ORDER;
89
-		break;
90
-		
91
-	case FileIndexerStep:
92
-		return CREATED_STEP_FILE_INDEXER;
93
-		break;
94
-
95
-	default:
96
-		return L"";
97
-		break;
98
-	}
99
-}
100
-
101
-/*
102
- * Convert a string to step type.
103
- */
104
-CreateStep affymetrix_calvin_array::CreateStepFromString(const std::wstring &step)
105
-{
106
-	if (step == CREATED_STEP_NONE)
107
-		return NoStep;
108
-
109
-	else if (step == CREATED_STEP_ARRAY_REG)
110
-		return ArrayRegistrationStep;
111
-
112
-	else if (step == CREATED_STEP_SCAN)
113
-		return ScanningStep;
114
-
115
-	else if (step == CREATED_STEP_GRID)
116
-		return GriddingStep;
117
-
118
-	else if (step == CREATED_STEP_CEL)
119
-		return CELAnalysisStep;
120
-
121
-	else if (step == CREATED_STEP_OTHER)
122
-		return OtherStep;
123
-
124
-	else if (step == CREATED_STEP_FROM)
125
-		return FromStep;
126
-		
127
-	else if (step == CREATED_STEP_JOB_ORDER)
128
-		return JobOrderServerStep;
129
-
130
-	else if (step == CREATED_STEP_FILE_INDEXER)
131
-		return FileIndexerStep;
132
-
133
-	else
134
-		return OtherStep;
135
-}
136
-
1
+////////////////////////////////////////////////////////////////
2
+//
3
+// Copyright (C) 2005 Affymetrix, Inc.
4
+//
5
+// This library is free software; you can redistribute it and/or modify
6
+// it under the terms of the GNU Lesser General Public License 
7
+// (version 2.1) as published by the Free Software Foundation.
8
+// 
9
+// This library is distributed in the hope that it will be useful, but
10
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
11
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
12
+// for more details.
13
+//