From 8fc5911429547bb199d1af617c12147c678cce06 Mon Sep 17 00:00:00 2001
From: mh17 <mh17>
Date: Mon, 14 Jun 2010 15:40:12 +0000
Subject: [PATCH] global addition of mh17's name and also #include zmap.h
---
src/zmapApp/zmapApp_P.h | 7 ++--
src/zmapApp/zmapAppconnect.c | 14 +++++--
src/zmapApp/zmapAppmain_c.c | 21 ++++++----
src/zmapApp/zmapAppmanage.c | 14 +++++--
src/zmapApp/zmapAppmenubar.c | 14 +++++--
src/zmapApp/zmapAppremote.c | 39 +++++++++++--------
src/zmapApp/zmapAppwindow.c | 14 +++++--
src/zmapConfig/zmapConfigDir.c | 16 ++++++--
src/zmapConfig/zmapConfigDir_P.h | 9 +++--
src/zmapConfig/zmapConfigFile.c | 14 +++++--
src/zmapConfig/zmapConfigIni.c | 14 +++++--
src/zmapConfig/zmapConfigIni_P.h | 9 +++--
src/zmapConfig/zmapConfigKey.c | 14 +++++--
src/zmapConfig/zmapConfigLoader.c | 14 +++++--
src/zmapControl/remote/xremote_gui_test.c | 14 +++++--
src/zmapControl/remote/zmapXRemote.c | 14 +++++--
src/zmapControl/remote/zmapXRemote_P.h | 7 ++--
src/zmapControl/zmapControl.c | 14 +++++--
src/zmapControl/zmapControlNavigator.c | 16 ++++++--
src/zmapControl/zmapControlPreferences.c | 14 +++++--
src/zmapControl/zmapControlRemoteReceive.c | 14 +++++--
src/zmapControl/zmapControlRemoteSend.c | 14 +++++--
src/zmapControl/zmapControlViews.c | 16 ++++++--
src/zmapControl/zmapControlWindow.c | 16 ++++++--
src/zmapControl/zmapControlWindowButtons.c | 12 +++++-
src/zmapControl/zmapControlWindowFrame.c | 14 +++++--
src/zmapControl/zmapControlWindowInfoPanel.c | 14 +++++--
src/zmapControl/zmapControlWindowMenubar.c | 14 +++++--
src/zmapControl/zmapControl_P.h | 7 ++--
src/zmapControl/zmapNavigator_P.h | 7 ++--
src/zmapDAS/zmapDAS1DSN.c | 14 +++++--
src/zmapDAS/zmapDAS1Parser.c | 14 +++++--
src/zmapDocs/ZMapMainPage.c | 14 +++++--
src/zmapDraw/zmapDraw.c | 14 +++++--
src/zmapDraw/zmapDraw_P.h | 9 +++--
src/zmapFeature/tests/check_zmapFeature.c | 14 +++++--
src/zmapFeature/tests/check_zmapFeature.h | 7 ++--
src/zmapFeature/tests/check_zmapFeature_P.c | 14 +++++--
src/zmapFeature/tests/check_zmapFeature_P.h | 7 ++--
src/zmapFeature/tests/check_zmapStyle.c | 14 +++++--
src/zmapFeature/tests/check_zmapStyle.h | 7 ++--
src/zmapFeature/tests/check_zmapStyle_P.c | 14 +++++--
src/zmapFeature/tests/check_zmapStyle_P.h | 7 ++--
src/zmapFeature/zmapFeature.c | 14 +++++--
.../zmapFeature3FrameTranslation.c | 14 +++++--
src/zmapFeature/zmapFeatureContext.c | 14 +++++--
src/zmapFeature/zmapFeatureContextUtils.c | 14 +++++--
src/zmapFeature/zmapFeatureDNA.c | 14 +++++--
src/zmapFeature/zmapFeatureData.c | 14 +++++--
src/zmapFeature/zmapFeatureFormatInput.c | 14 +++++--
src/zmapFeature/zmapFeatureOutput.c | 14 +++++--
src/zmapFeature/zmapFeatureTypes.c | 14 +++++--
src/zmapFeature/zmapFeatureUtils.c | 14 +++++--
src/zmapFeature/zmapFeatureXML.c | 14 +++++--
src/zmapFeature/zmapFeature_P.h | 7 ++--
src/zmapFeature/zmapStyle.c | 14 +++++--
src/zmapFeature/zmapStyleUtils.c | 14 +++++--
src/zmapFeature/zmapStyle_I.h | 7 ++--
src/zmapFeature/zmapStyle_P.h | 7 ++--
src/zmapGFF/gffparser.c | 16 ++++++--
src/zmapGFF/zmapGFF2Dumper.c | 14 +++++--
src/zmapGFF/zmapGFF2parser.c | 14 +++++--
src/zmapGFF/zmapGFF_P.h | 7 ++--
src/zmapManager/zmapManager.c | 14 +++++--
src/zmapManager/zmapManager_P.h | 7 ++--
src/zmapServer/acedb/acedbServer.c | 14 +++++--
src/zmapServer/acedb/acedbServer_P.h | 7 ++--
src/zmapServer/das/dasServer.c | 14 +++++--
src/zmapServer/das/dasServer_P.h | 7 ++--
src/zmapServer/file/fileServer.c | 14 +++++--
src/zmapServer/file/fileServer_P.h | 7 ++--
src/zmapServer/pipe/pipeServer.c | 14 +++++--
src/zmapServer/pipe/pipeServer_P.h | 7 ++--
src/zmapServer/zmapServer.c | 16 ++++++--
src/zmapServer/zmapServer.h | 7 ++--
src/zmapServer/zmapServerProtocolHandler.c | 14 +++++--
src/zmapServer/zmapServerPrototype.h | 7 ++--
src/zmapServer/zmapServer_P.h | 7 ++--
src/zmapThreads/zmapSlave.c | 14 +++++--
src/zmapThreads/zmapSlave.test.c | 16 ++++++--
src/zmapThreads/zmapSlave_P.h | 9 +++--
src/zmapThreads/zmapThreads.c | 14 +++++--
src/zmapThreads/zmapThreadsUtils.c | 14 +++++--
src/zmapThreads/zmapThreads_P.h | 7 ++--
src/zmapUtils/safe-ctype.c | 7 ++++
src/zmapUtils/tests/check_zmapConfigLoader.c | 14 +++++--
src/zmapUtils/tests/check_zmapConfigLoader.h | 7 ++--
src/zmapUtils/zmapBase.c | 14 +++++--
src/zmapUtils/zmapBase_I.h | 7 ++--
src/zmapUtils/zmapCmdLineArgs.c | 16 ++++++--
src/zmapUtils/zmapCmdLineArgs_P.h | 9 +++--
src/zmapUtils/zmapCoords.c | 14 +++++--
src/zmapUtils/zmapDNA.c | 14 +++++--
src/zmapUtils/zmapFASTA.c | 14 +++++--
src/zmapUtils/zmapFileUtils.c | 14 +++++--
src/zmapUtils/zmapFooUtils.c | 14 +++++--
src/zmapUtils/zmapGLibUtils.c | 14 +++++--
src/zmapUtils/zmapGUINotebook.c | 14 +++++--
src/zmapUtils/zmapGUITreeView.c | 14 +++++--
src/zmapUtils/zmapGUITreeView_I.h | 7 ++--
src/zmapUtils/zmapGUImenus.c | 14 +++++--
src/zmapUtils/zmapGUIutils.c | 14 +++++--
src/zmapUtils/zmapHandle.c | 14 +++++--
src/zmapUtils/zmapIOOut.c | 14 +++++--
src/zmapUtils/zmapIO_P.h | 7 ++--
src/zmapUtils/zmapLogging.c | 14 +++++--
src/zmapUtils/zmapPeptide.c | 14 +++++--
src/zmapUtils/zmapReadLine.c | 14 +++++--
src/zmapUtils/zmapReadLine_P.h | 7 ++--
src/zmapUtils/zmapSeqBitmap.c | 14 +++++--
src/zmapUtils/zmapSequence.c | 14 +++++--
src/zmapUtils/zmapString.c | 14 +++++--
src/zmapUtils/zmapUrl.c | 7 ++++
src/zmapUtils/zmapUrlUtils.c | 7 ++++
src/zmapUtils/zmapUtils.c | 14 +++++--
src/zmapUtils/zmapUtilsConfig.c | 14 +++++--
src/zmapUtils/zmapUtilsSpawn.c | 14 +++++--
src/zmapUtils/zmapUtilsUsers.c | 14 +++++--
src/zmapUtils/zmapUtils_P.h | 7 ++--
src/zmapUtils/zmapWebBrowser.c | 14 +++++--
src/zmapUtils/zmapXRemoteUtils.c | 14 +++++--
src/zmapView/zmapView.c | 14 +++++--
src/zmapView/zmapViewCallBlixem.c | 14 +++++--
src/zmapView/zmapViewRemoteReceive.c | 14 +++++--
src/zmapView/zmapViewRemoteSend.c | 14 +++++--
src/zmapView/zmapViewUtils.c | 14 +++++--
src/zmapView/zmapView_P.h | 7 ++--
.../items/zmapWindowAlignmentFeature.c | 14 +++++--
.../items/zmapWindowAlignmentFeature.h | 7 ++--
.../items/zmapWindowAlignmentFeature_I.h | 7 ++--
src/zmapWindow/items/zmapWindowAllBase.c | 14 +++++--
src/zmapWindow/items/zmapWindowAllBase.h | 7 ++--
.../items/zmapWindowAssemblyFeature.c | 14 +++++--
.../items/zmapWindowAssemblyFeature.h | 7 ++--
.../items/zmapWindowAssemblyFeature_I.h | 7 ++--
src/zmapWindow/items/zmapWindowBasicFeature.c | 14 +++++--
src/zmapWindow/items/zmapWindowBasicFeature.h | 7 ++--
.../items/zmapWindowBasicFeature_I.h | 7 ++--
src/zmapWindow/items/zmapWindowCanvas.c | 14 +++++--
src/zmapWindow/items/zmapWindowCanvas.h | 7 ++--
src/zmapWindow/items/zmapWindowCanvasItem.c | 14 +++++--
src/zmapWindow/items/zmapWindowCanvasItem.h | 7 ++--
src/zmapWindow/items/zmapWindowCanvasItem_I.h | 7 ++--
src/zmapWindow/items/zmapWindowCanvas_I.h | 7 ++--
.../items/zmapWindowContainerAlignment.c | 14 +++++--
.../items/zmapWindowContainerAlignment.h | 7 ++--
.../items/zmapWindowContainerAlignment_I.h | 7 ++--
.../items/zmapWindowContainerBlock.c | 14 +++++--
.../items/zmapWindowContainerBlock.h | 7 ++--
.../items/zmapWindowContainerBlock_I.h | 7 ++--
.../items/zmapWindowContainerChildren.c | 14 +++++--
.../items/zmapWindowContainerChildren.h | 7 ++--
.../items/zmapWindowContainerChildren_I.h | 7 ++--
.../items/zmapWindowContainerContext.c | 14 +++++--
.../items/zmapWindowContainerContext.h | 7 ++--
.../items/zmapWindowContainerContext_I.h | 7 ++--
.../items/zmapWindowContainerFeatureSet.c | 14 +++++--
.../items/zmapWindowContainerFeatureSet.h | 7 ++--
.../zmapWindowContainerFeatureSetUtils.c | 14 +++++--
.../items/zmapWindowContainerFeatureSet_I.h | 7 ++--
.../items/zmapWindowContainerGroup.c | 14 +++++--
.../items/zmapWindowContainerGroup.h | 7 ++--
.../items/zmapWindowContainerGroup_I.h | 7 ++--
.../items/zmapWindowContainerStrand.c | 14 +++++--
.../items/zmapWindowContainerStrand.h | 7 ++--
.../items/zmapWindowContainerStrand_I.h | 7 ++--
.../items/zmapWindowContainerUtils.c | 14 +++++--
.../items/zmapWindowContainerUtils.h | 7 ++--
.../items/zmapWindowContainerUtils_P.h | 7 ++--
src/zmapWindow/items/zmapWindowContainers.h | 7 ++--
src/zmapWindow/items/zmapWindowContainers_I.h | 7 ++--
src/zmapWindow/items/zmapWindowFeatures.h | 7 ++--
src/zmapWindow/items/zmapWindowFeatures_I.h | 7 ++--
src/zmapWindow/items/zmapWindowGlyphItem.c | 16 ++++++--
src/zmapWindow/items/zmapWindowGlyphItem.h | 7 ++--
src/zmapWindow/items/zmapWindowGlyphItem_I.h | 7 ++--
src/zmapWindow/items/zmapWindowLongItem.c | 14 +++++--
src/zmapWindow/items/zmapWindowLongItem.h | 7 ++--
src/zmapWindow/items/zmapWindowLongItem_I.h | 7 ++--
src/zmapWindow/items/zmapWindowLongItems_P.h | 7 ++--
.../items/zmapWindowSequenceFeature.c | 14 +++++--
.../items/zmapWindowSequenceFeature.h | 7 ++--
.../items/zmapWindowSequenceFeature_I.h | 7 ++--
src/zmapWindow/items/zmapWindowTextFeature.c | 14 +++++--
src/zmapWindow/items/zmapWindowTextFeature.h | 7 ++--
.../items/zmapWindowTextFeature_I.h | 7 ++--
src/zmapWindow/items/zmapWindowTextItem.c | 14 +++++--
src/zmapWindow/items/zmapWindowTextItem.h | 7 ++--
src/zmapWindow/items/zmapWindowTextItem_I.h | 7 ++--
.../items/zmapWindowTranscriptFeature.c | 14 +++++--
.../items/zmapWindowTranscriptFeature.h | 7 ++--
.../items/zmapWindowTranscriptFeature_I.h | 7 ++--
src/zmapWindow/zmapWindow.c | 14 +++++--
src/zmapWindow/zmapWindowColBump.c | 14 +++++--
src/zmapWindow/zmapWindowColConfig.c | 14 +++++--
src/zmapWindow/zmapWindowColOrder.c | 14 +++++--
src/zmapWindow/zmapWindowDNA.c | 14 +++++--
src/zmapWindow/zmapWindowDNAChoose.c | 14 +++++--
src/zmapWindow/zmapWindowDNAList.c | 14 +++++--
src/zmapWindow/zmapWindowDNAList.h | 7 ++--
src/zmapWindow/zmapWindowDNAList_I.h | 7 ++--
src/zmapWindow/zmapWindowDraw.c | 14 +++++--
src/zmapWindow/zmapWindowDrawFeatures.c | 14 +++++--
src/zmapWindow/zmapWindowDump.c | 14 +++++--
src/zmapWindow/zmapWindowExport.c | 14 +++++--
src/zmapWindow/zmapWindowFeature.c | 14 +++++--
src/zmapWindow/zmapWindowFeatureList.c | 14 +++++--
src/zmapWindow/zmapWindowFeatureList.h | 7 ++--
src/zmapWindow/zmapWindowFeatureList_I.h | 7 ++--
src/zmapWindow/zmapWindowFeatureShow.c | 14 +++++--
src/zmapWindow/zmapWindowFocus.c | 14 +++++--
src/zmapWindow/zmapWindowFrame.c | 14 +++++--
src/zmapWindow/zmapWindowItem.c | 14 +++++--
src/zmapWindow/zmapWindowItemDebug.c | 14 +++++--
src/zmapWindow/zmapWindowItemFactory.c | 14 +++++--
src/zmapWindow/zmapWindowItemFactory.h | 7 ++--
src/zmapWindow/zmapWindowItemHash.c | 14 +++++--
src/zmapWindow/zmapWindowItemText.c | 14 +++++--
src/zmapWindow/zmapWindowItemTextFillColumn.h | 7 ++--
src/zmapWindow/zmapWindowList.c | 14 +++++--
src/zmapWindow/zmapWindowLongItems.c | 14 +++++--
src/zmapWindow/zmapWindowMark.c | 14 +++++--
src/zmapWindow/zmapWindowMark_P.h | 7 ++--
src/zmapWindow/zmapWindowMenus.c | 14 +++++--
src/zmapWindow/zmapWindowNavigator.c | 14 +++++--
src/zmapWindow/zmapWindowNavigatorMenus.c | 14 +++++--
src/zmapWindow/zmapWindowNavigatorWidget.c | 14 +++++--
src/zmapWindow/zmapWindowNavigator_P.h | 7 ++--
src/zmapWindow/zmapWindowOverlays.c | 14 +++++--
src/zmapWindow/zmapWindowOverlays.h | 7 ++--
src/zmapWindow/zmapWindowPreferences.c | 14 +++++--
src/zmapWindow/zmapWindowPrint.c | 14 +++++--
src/zmapWindow/zmapWindowRemoteReceive.c | 14 +++++--
src/zmapWindow/zmapWindowRuler.c | 14 +++++--
src/zmapWindow/zmapWindowSearch.c | 14 +++++--
src/zmapWindow/zmapWindowState.c | 14 +++++--
src/zmapWindow/zmapWindowState.h | 7 ++--
src/zmapWindow/zmapWindowStats.c | 14 +++++--
src/zmapWindow/zmapWindowTextPositioner.c | 14 +++++--
src/zmapWindow/zmapWindowTextPositioner.h | 7 ++--
src/zmapWindow/zmapWindowUtils.c | 14 +++++--
src/zmapWindow/zmapWindowZoomControl.c | 16 ++++++--
src/zmapWindow/zmapWindowZoomControl_P.h | 9 +++--
src/zmapWindow/zmapWindow_P.h | 7 ++--
src/zmapXML/example_xml_writer.c | 14 +++++--
src/zmapXML/zmapXMLAttribute.c | 16 ++++++--
src/zmapXML/zmapXMLDocument.c | 16 ++++++--
src/zmapXML/zmapXMLElement.c | 16 ++++++--
src/zmapXML/zmapXMLParse.c | 16 ++++++--
src/zmapXML/zmapXMLUtils.c | 14 +++++--
src/zmapXML/zmapXMLWriter.c | 14 +++++--
src/zmapXML/zmapXML_P.h | 9 +++--
252 files changed, 2158 insertions(+), 784 deletions(-)
diff --git a/src/zmapApp/zmapApp_P.h b/src/zmapApp/zmapApp_P.h
index f83e4e0be..4f4131ffd 100755
--- a/src/zmapApp/zmapApp_P.h
+++ b/src/zmapApp/zmapApp_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Private header for application level of zmap.
*
* HISTORY:
* Last edited: Mar 2 14:22 2010 (edgrif)
* Created: Thu Jul 24 14:35:41 2003 (edgrif)
- * CVS info: $Id: zmapApp_P.h,v 1.29 2010-03-04 15:09:33 mh17 Exp $
+ * CVS info: $Id: zmapApp_P.h,v 1.30 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_APP_PRIV_H
diff --git a/src/zmapApp/zmapAppconnect.c b/src/zmapApp/zmapAppconnect.c
index ff4db4b46..4d79b8e04 100755
--- a/src/zmapApp/zmapAppconnect.c
+++ b/src/zmapApp/zmapAppconnect.c
@@ -19,18 +19,26 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See zmapApp_P.h
* HISTORY:
* Last edited: Feb 4 16:20 2010 (edgrif)
* Created: Thu Jul 24 14:36:37 2003 (edgrif)
- * CVS info: $Id: zmapAppconnect.c,v 1.26 2010-03-04 15:09:34 mh17 Exp $
+ * CVS info: $Id: zmapAppconnect.c,v 1.27 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/zmapApp/zmapAppmain_c.c b/src/zmapApp/zmapAppmain_c.c
index 716db90aa..6030eaa35 100755
--- a/src/zmapApp/zmapAppmain_c.c
+++ b/src/zmapApp/zmapAppmain_c.c
@@ -6,12 +6,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -19,9 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
- * name
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: C main, if the executable is compiled/linked with
* main then you get a standard C executable.
@@ -29,16 +29,23 @@
* HISTORY:
* Last edited: Nov 13 14:40 2003 (edgrif)
* Created: Thu Nov 13 14:38:41 2003 (edgrif)
- * CVS info: $Id: zmapAppmain_c.c,v 1.4 2010-06-14 11:04:18 mh17 Exp $
+ * CVS info: $Id: zmapAppmain_c.c,v 1.5 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapApp_P.h>
int main(int argc, char *argv[])
{
int main_rc ;
-
+
main_rc = zmapMainMakeAppWindow(argc, argv) ;
return(main_rc) ;
diff --git a/src/zmapApp/zmapAppmanage.c b/src/zmapApp/zmapAppmanage.c
index 5a9208bee..e05789a2f 100755
--- a/src/zmapApp/zmapAppmanage.c
+++ b/src/zmapApp/zmapAppmanage.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Top level of application, creates ZMaps.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: May 25 13:14 2006 (rds)
* Created: Thu Jul 24 14:36:47 2003 (edgrif)
- * CVS info: $Id: zmapAppmanage.c,v 1.16 2010-03-04 15:09:36 mh17 Exp $
+ * CVS info: $Id: zmapAppmanage.c,v 1.17 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdlib.h>
#include <stdio.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapApp/zmapAppmenubar.c b/src/zmapApp/zmapAppmenubar.c
index 285abe4cf..fa237e90a 100755
--- a/src/zmapApp/zmapAppmenubar.c
+++ b/src/zmapApp/zmapAppmenubar.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements zmap main window menubar.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jun 7 10:27 2007 (edgrif)
* Created: Thu Jul 24 14:36:59 2003 (edgrif)
- * CVS info: $Id: zmapAppmenubar.c,v 1.8 2010-03-04 15:09:37 mh17 Exp $
+ * CVS info: $Id: zmapAppmenubar.c,v 1.9 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdlib.h>
#include <stdio.h>
#include <ZMap/zmapUtilsGUI.h>
diff --git a/src/zmapApp/zmapAppremote.c b/src/zmapApp/zmapAppremote.c
index e2f61fae4..73585a64d 100755
--- a/src/zmapApp/zmapAppremote.c
+++ b/src/zmapApp/zmapAppremote.c
@@ -6,12 +6,12 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -19,21 +19,28 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
* Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
- * name
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
- * Description:
+ * Description:
*
* Exported functions: None
* HISTORY:
* Last edited: Mar 25 14:41 2010 (edgrif)
* Created: Thu May 5 18:19:30 2005 (rds)
- * CVS info: $Id: zmapAppremote.c,v 1.41 2010-06-14 11:04:21 mh17 Exp $
+ * CVS info: $Id: zmapAppremote.c,v 1.42 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <zmapApp_P.h>
#include <ZMap/zmapXML.h>
@@ -56,9 +63,9 @@ typedef enum
typedef enum {RUNNING_ZMAPS, KILLING_ALL_ZMAPS = 1} ZMapAppContextState;
-/* This should be somewhere else ...
+/* This should be somewhere else ...
or we should be making other objects */
-typedef struct
+typedef struct
{
ZMapAppContext app_context;
ZMapAppValidXRemoteAction action;
@@ -107,8 +114,8 @@ void zmapAppRemoteInstaller(GtkWidget *widget, gpointer app_context_data)
ZMapAppContext app_context = (ZMapAppContext)app_context_data;
ZMapCmdLineArgsType value ;
- zMapXRemoteInitialiseWidget(widget, PACKAGE_NAME,
- ZMAP_DEFAULT_REQUEST_ATOM_NAME,
+ zMapXRemoteInitialiseWidget(widget, PACKAGE_NAME,
+ ZMAP_DEFAULT_REQUEST_ATOM_NAME,
ZMAP_DEFAULT_RESPONSE_ATOM_NAME,
application_execute_command, app_context_data);
@@ -215,7 +222,7 @@ static char *application_execute_command(char *command_text, gpointer app_contex
response_data.code = ZMAPXREMOTE_INTERNAL; /* unknown command if this isn't changed */
response_data.message = g_string_sized_new(256);
-
+
switch(request_data.action)
{
case ZMAPAPP_REMOTE_OPEN_ZMAP:
@@ -284,7 +291,7 @@ static void createZMap(ZMapAppContext app, RequestData request_data, ResponseCon
response_data->handled = TRUE;
/* that screwy rabbit */
g_string_append_printf(response_data->message, "%s", app->info->message);
-
+
/* Clean up. */
if (sequence)
g_free(sequence) ;
@@ -332,7 +339,7 @@ static gboolean start(void *user_data, ZMapXMLElement element, ZMapXMLParser par
RequestData request_data = (RequestData)user_data;
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
-
+
return handled ;
}
@@ -354,7 +361,7 @@ static gboolean req_start(void *user_data, ZMapXMLElement element, ZMapXMLParser
gboolean handled = FALSE;
RequestData request_data = (RequestData)user_data;
ZMapXMLAttribute attr = NULL;
-
+
if ((attr = zMapXMLElementGetAttributeByName(element, "action")) != NULL)
{
GQuark action = zMapXMLAttributeGetValue(attr);
@@ -382,7 +389,7 @@ static gboolean req_end(void *user_data, ZMapXMLElement element, ZMapXMLParser p
RequestData request_data = (RequestData)user_data;
ZMapXMLElement child ;
ZMapXMLAttribute attr;
-
+
if ((child = zMapXMLElementGetChildByName(element, "segment")) != NULL)
{
if((attr = zMapXMLElementGetAttributeByName(child, "sequence")) != NULL)
diff --git a/src/zmapApp/zmapAppwindow.c b/src/zmapApp/zmapAppwindow.c
index efdc6942c..9ac90e52f 100755
--- a/src/zmapApp/zmapAppwindow.c
+++ b/src/zmapApp/zmapAppwindow.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Creates the first toplevel window in the zmap app.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jun 9 10:05 2010 (edgrif)
* Created: Thu Jul 24 14:36:27 2003 (edgrif)
- * CVS info: $Id: zmapAppwindow.c,v 1.71 2010-06-09 10:50:51 edgrif Exp $
+ * CVS info: $Id: zmapAppwindow.c,v 1.72 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/zmapConfig/zmapConfigDir.c b/src/zmapConfig/zmapConfigDir.c
index 196ca6517..fa5607b77 100644
--- a/src/zmapConfig/zmapConfigDir.c
+++ b/src/zmapConfig/zmapConfigDir.c
@@ -19,10 +19,11 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
* Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
- * name
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
+name
*
* Description:
*
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Jun 24 14:26 2009 (edgrif)
* Created: Thu Feb 10 10:05:36 2005 (edgrif)
- * CVS info: $Id: zmapConfigDir.c,v 1.4 2010-06-14 11:04:24 mh17 Exp $
+ * CVS info: $Id: zmapConfigDir.c,v 1.5 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
#include <ZMap/zmapUtils.h>
#include <zmapConfigDir_P.h>
diff --git a/src/zmapConfig/zmapConfigDir_P.h b/src/zmapConfig/zmapConfigDir_P.h
index 0ee1c5797..e12c12e6c 100644
--- a/src/zmapConfig/zmapConfigDir_P.h
+++ b/src/zmapConfig/zmapConfigDir_P.h
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Aug 28 15:13 2008 (rds)
* Created: Thu Feb 10 10:10:27 2005 (edgrif)
- * CVS info: $Id: zmapConfigDir_P.h,v 1.2 2010-03-04 15:09:41 mh17 Exp $
+ * CVS info: $Id: zmapConfigDir_P.h,v 1.3 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_CONFIGDIR_P_H
diff --git a/src/zmapConfig/zmapConfigFile.c b/src/zmapConfig/zmapConfigFile.c
index af2e4fd0e..0dfd55227 100644
--- a/src/zmapConfig/zmapConfigFile.c
+++ b/src/zmapConfig/zmapConfigFile.c
@@ -20,18 +20,26 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Created: 2009-12-09 12:09:18 (mgh)
- * CVS info: $Id: zmapConfigFile.c,v 1.4 2010-03-19 08:56:41 mh17 Exp $
+ * CVS info: $Id: zmapConfigFile.c,v 1.5 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h> /* memset */
#include <glib.h>
#include <zmapConfigIni_P.h>
diff --git a/src/zmapConfig/zmapConfigIni.c b/src/zmapConfig/zmapConfigIni.c
index f941bdc37..fceb7833a 100755
--- a/src/zmapConfig/zmapConfigIni.c
+++ b/src/zmapConfig/zmapConfigIni.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 26 15:30 2009 (edgrif)
* Created: Wed Aug 27 16:21:40 2008 (rds)
- * CVS info: $Id: zmapConfigIni.c,v 1.13 2010-03-04 15:09:43 mh17 Exp $
+ * CVS info: $Id: zmapConfigIni.c,v 1.14 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h> /* memset */
#include <glib.h>
#include <zmapConfigIni_P.h>
diff --git a/src/zmapConfig/zmapConfigIni_P.h b/src/zmapConfig/zmapConfigIni_P.h
index 7b977899e..7146a4380 100644
--- a/src/zmapConfig/zmapConfigIni_P.h
+++ b/src/zmapConfig/zmapConfigIni_P.h
@@ -19,16 +19,17 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
* Exported functions: See ZMap/ConfigIni.h
* HISTORY:
* Created: 2009-12-09 13:10:58 (mgh)
- * CVS info: $Id: zmapConfigIni_P.h,v 1.4 2010-03-19 08:56:42 mh17 Exp $
+ * CVS info: $Id: zmapConfigIni_P.h,v 1.5 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_CONFIGINI_P_H
diff --git a/src/zmapConfig/zmapConfigKey.c b/src/zmapConfig/zmapConfigKey.c
index d8c7d603c..f18ecabe2 100644
--- a/src/zmapConfig/zmapConfigKey.c
+++ b/src/zmapConfig/zmapConfigKey.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 9 09:35 2010 (edgrif)
* Created: Wed Aug 27 16:21:40 2008 (rds)
- * CVS info: $Id: zmapConfigKey.c,v 1.4 2010-06-09 10:54:41 edgrif Exp $
+ * CVS info: $Id: zmapConfigKey.c,v 1.5 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h> /* memset */
#include <glib.h>
diff --git a/src/zmapConfig/zmapConfigLoader.c b/src/zmapConfig/zmapConfigLoader.c
index 7fbc48a92..ed8bc3111 100644
--- a/src/zmapConfig/zmapConfigLoader.c
+++ b/src/zmapConfig/zmapConfigLoader.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Holds functions for reading config stanzas for various
* different parts of code....ummm, not well compartmentalised.
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Mar 2 14:47 2010 (edgrif)
* Created: Thu Sep 25 14:12:05 2008 (rds)
- * CVS info: $Id: zmapConfigLoader.c,v 1.23 2010-06-08 08:31:23 mh17 Exp $
+ * CVS info: $Id: zmapConfigLoader.c,v 1.24 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
//#include <unistd.h>
#include <glib.h>
diff --git a/src/zmapControl/remote/xremote_gui_test.c b/src/zmapControl/remote/xremote_gui_test.c
index 6d2c6b518..243fc1398 100755
--- a/src/zmapControl/remote/xremote_gui_test.c
+++ b/src/zmapControl/remote/xremote_gui_test.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Test program for ZMap Xremote API.
*
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Mar 26 09:20 2010 (edgrif)
* Created: Thu Feb 15 11:25:20 2007 (rds)
- * CVS info: $Id: xremote_gui_test.c,v 1.21 2010-03-29 09:54:55 edgrif Exp $
+ * CVS info: $Id: xremote_gui_test.c,v 1.22 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <unistd.h>
#include <sys/types.h>
#include <signal.h>
diff --git a/src/zmapControl/remote/zmapXRemote.c b/src/zmapControl/remote/zmapXRemote.c
index 448cd8847..ff81caac2 100755
--- a/src/zmapControl/remote/zmapXRemote.c
+++ b/src/zmapControl/remote/zmapXRemote.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
* Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * name
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
+name
*
* Description: Implements the essential code for allows external client
* programs to communicate with ZMap. This same code is
@@ -32,10 +33,17 @@
* HISTORY:
* Last edited: May 5 16:13 2010 (edgrif)
* Created: Wed Apr 13 19:04:48 2005 (rds)
- * CVS info: $Id: zmapXRemote.c,v 1.49 2010-06-14 11:04:30 mh17 Exp $
+ * CVS info: $Id: zmapXRemote.c,v 1.50 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include "zmapXRemote_P.h"
diff --git a/src/zmapControl/remote/zmapXRemote_P.h b/src/zmapControl/remote/zmapXRemote_P.h
index f01b9360a..e01e28bcd 100755
--- a/src/zmapControl/remote/zmapXRemote_P.h
+++ b/src/zmapControl/remote/zmapXRemote_P.h
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -28,7 +29,7 @@
* HISTORY:
* Last edited: May 6 15:57 2010 (edgrif)
* Created: Thu Apr 14 13:07:51 2005 (rds)
- * CVS info: $Id: zmapXRemote_P.h,v 1.23 2010-05-06 15:20:41 edgrif Exp $
+ * CVS info: $Id: zmapXRemote_P.h,v 1.24 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapControl/zmapControl.c b/src/zmapControl/zmapControl.c
index 4ab010e30..83c007778 100755
--- a/src/zmapControl/zmapControl.c
+++ b/src/zmapControl/zmapControl.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: This is the ZMap interface code, it controls both
* the window code and the threaded server code.
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Feb 1 15:12 2010 (edgrif)
* Created: Thu Jul 24 16:06:44 2003 (edgrif)
- * CVS info: $Id: zmapControl.c,v 1.100 2010-04-26 14:29:42 mh17 Exp $
+ * CVS info: $Id: zmapControl.c,v 1.101 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <gtk/gtk.h>
#include <ZMap/zmapView.h>
diff --git a/src/zmapControl/zmapControlNavigator.c b/src/zmapControl/zmapControlNavigator.c
index f0bd848d9..14b13c1eb 100755
--- a/src/zmapControl/zmapControlNavigator.c
+++ b/src/zmapControl/zmapControlNavigator.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
- * name
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
+name
*
* Description: Implements the navigator window in a zmap.
* We tried using a scale widget but you can't set the size
@@ -32,10 +33,17 @@
* HISTORY:
* Last edited: Aug 1 12:24 2007 (rds)
* Created: Thu Jul 8 12:54:27 2004 (edgrif)
- * CVS info: $Id: zmapControlNavigator.c,v 1.33 2010-06-14 11:04:33 mh17 Exp $
+ * CVS info: $Id: zmapControlNavigator.c,v 1.34 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <gtk/gtk.h>
#include <zmapNavigator_P.h>
diff --git a/src/zmapControl/zmapControlPreferences.c b/src/zmapControl/zmapControlPreferences.c
index e5c65b73c..5c039d31c 100755
--- a/src/zmapControl/zmapControlPreferences.c
+++ b/src/zmapControl/zmapControlPreferences.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements showing the preferences configuration
* window for a zmapControl instance.
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Nov 20 09:32 2008 (rds)
* Created: Wed Oct 24 15:48:11 2007 (edgrif)
- * CVS info: $Id: zmapControlPreferences.c,v 1.5 2010-03-04 15:09:53 mh17 Exp $
+ * CVS info: $Id: zmapControlPreferences.c,v 1.6 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapUtilsGUI.h>
diff --git a/src/zmapControl/zmapControlRemoteReceive.c b/src/zmapControl/zmapControlRemoteReceive.c
index b17687893..b27c24720 100755
--- a/src/zmapControl/zmapControlRemoteReceive.c
+++ b/src/zmapControl/zmapControlRemoteReceive.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Interface functions for xremote API to zmap control window.
*
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Mar 25 14:42 2010 (edgrif)
* Created: Thu Jul 12 14:54:30 2007 (rds)
- * CVS info: $Id: zmapControlRemoteReceive.c,v 1.11 2010-03-29 09:54:30 edgrif Exp $
+ * CVS info: $Id: zmapControlRemoteReceive.c,v 1.12 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapView.h>
diff --git a/src/zmapControl/zmapControlRemoteSend.c b/src/zmapControl/zmapControlRemoteSend.c
index 1db7acb3c..a03c6fa08 100755
--- a/src/zmapControl/zmapControlRemoteSend.c
+++ b/src/zmapControl/zmapControlRemoteSend.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Dec 16 14:58 2008 (edgrif)
* Created: Thu Jul 12 14:54:52 2007 (rds)
- * CVS info: $Id: zmapControlRemoteSend.c,v 1.3 2010-03-04 15:09:55 mh17 Exp $
+ * CVS info: $Id: zmapControlRemoteSend.c,v 1.4 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapControl/zmapControlViews.c b/src/zmapControl/zmapControlViews.c
index 0031457aa..e1731eb1a 100755
--- a/src/zmapControl/zmapControlViews.c
+++ b/src/zmapControl/zmapControlViews.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
- * name
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
+name
*
* Description: Splits the zmap window to show either the same view twice
* or two different views.
@@ -32,9 +33,16 @@
* HISTORY:
* Last edited: Dec 9 16:15 2008 (edgrif)
* Created: Mon Jan 10 10:38:43 2005 (edgrif)
- * CVS info: $Id: zmapControlViews.c,v 1.27 2010-06-14 11:04:37 mh17 Exp $
+ * CVS info: $Id: zmapControlViews.c,v 1.28 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+
+#include <ZMap/zmap.h>
+
+
+
+
+
#include <zmapControl_P.h>
#include <ZMap/zmapUtilsDebug.h>
diff --git a/src/zmapControl/zmapControlWindow.c b/src/zmapControl/zmapControlWindow.c
index d7d847db7..875dc9dd7 100755
--- a/src/zmapControl/zmapControlWindow.c
+++ b/src/zmapControl/zmapControlWindow.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
- * name
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
+name
*
* Description: Creates the top level window of a ZMap.
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 10 10:48 2010 (edgrif)
* Created: Fri May 7 14:43:28 2004 (edgrif)
- * CVS info: $Id: zmapControlWindow.c,v 1.39 2010-06-14 11:04:38 mh17 Exp $
+ * CVS info: $Id: zmapControlWindow.c,v 1.40 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapControl/zmapControlWindowButtons.c b/src/zmapControl/zmapControlWindowButtons.c
index ab96ffe78..092c92172 100755
--- a/src/zmapControl/zmapControlWindowButtons.c
+++ b/src/zmapControl/zmapControlWindowButtons.c
@@ -19,7 +19,8 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implement the buttons on the zmap.
*
@@ -27,10 +28,17 @@
* HISTORY:
* Last edited: Nov 3 12:27 2008 (rds)
* Created: Thu Jul 24 14:36:27 2003 (edgrif)
- * CVS info: $Id: zmapControlWindowButtons.c,v 1.56 2010-03-29 15:32:39 mh17 Exp $
+ * CVS info: $Id: zmapControlWindowButtons.c,v 1.57 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapWindow.h>
diff --git a/src/zmapControl/zmapControlWindowFrame.c b/src/zmapControl/zmapControlWindowFrame.c
index e6efdcd4e..4b4694cea 100755
--- a/src/zmapControl/zmapControlWindowFrame.c
+++ b/src/zmapControl/zmapControlWindowFrame.c
@@ -19,18 +19,26 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: May 1 12:10 2008 (rds)
* Created: Thu Apr 29 11:06:06 2004 (edgrif)
- * CVS info: $Id: zmapControlWindowFrame.c,v 1.26 2010-03-04 15:09:59 mh17 Exp $
+ * CVS info: $Id: zmapControlWindowFrame.c,v 1.27 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapControl_P.h>
diff --git a/src/zmapControl/zmapControlWindowInfoPanel.c b/src/zmapControl/zmapControlWindowInfoPanel.c
index e5f6e0491..166aa817f 100755
--- a/src/zmapControl/zmapControlWindowInfoPanel.c
+++ b/src/zmapControl/zmapControlWindowInfoPanel.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Makes the information panel at the top of a zmap which
* shows details of features that the user selects.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Dec 17 11:15 2009 (edgrif)
* Created: Tue Jul 18 10:02:04 2006 (edgrif)
- * CVS info: $Id: zmapControlWindowInfoPanel.c,v 1.25 2010-03-04 15:10:00 mh17 Exp $
+ * CVS info: $Id: zmapControlWindowInfoPanel.c,v 1.26 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapControl_P.h>
diff --git a/src/zmapControl/zmapControlWindowMenubar.c b/src/zmapControl/zmapControlWindowMenubar.c
index d59399a78..4a91682e8 100755
--- a/src/zmapControl/zmapControlWindowMenubar.c
+++ b/src/zmapControl/zmapControlWindowMenubar.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Code for the menubar in a zmap window.
*
@@ -33,10 +34,17 @@
* HISTORY:
* Last edited: Sep 24 13:56 2009 (edgrif)
* Created: Thu Jul 24 14:36:59 2003 (edgrif)
- * CVS info: $Id: zmapControlWindowMenubar.c,v 1.37 2010-03-04 15:10:01 mh17 Exp $
+ * CVS info: $Id: zmapControlWindowMenubar.c,v 1.38 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdlib.h>
#include <stdio.h>
diff --git a/src/zmapControl/zmapControl_P.h b/src/zmapControl/zmapControl_P.h
index 5e18edcb9..7dbf33ec0 100755
--- a/src/zmapControl/zmapControl_P.h
+++ b/src/zmapControl/zmapControl_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Private header for interface that creates/manages/destroys
* instances of ZMaps.
* HISTORY:
* Last edited: Feb 8 15:17 2010 (edgrif)
* Created: Thu Jul 24 14:39:06 2003 (edgrif)
- * CVS info: $Id: zmapControl_P.h,v 1.76 2010-03-04 15:10:02 mh17 Exp $
+ * CVS info: $Id: zmapControl_P.h,v 1.77 2010-06-14 15:40:12 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_CONTROL_P_H
diff --git a/src/zmapControl/zmapNavigator_P.h b/src/zmapControl/zmapNavigator_P.h
index 3455a14f2..1589dd3e1 100755
--- a/src/zmapControl/zmapNavigator_P.h
+++ b/src/zmapControl/zmapNavigator_P.h
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Private header for the navigator code which displays
* positional information for sequences.
@@ -28,7 +29,7 @@
* HISTORY:
* Last edited: Jul 31 18:25 2007 (rds)
* Created: Fri Jan 7 13:50:33 2005 (edgrif)
- * CVS info: $Id: zmapNavigator_P.h,v 1.6 2010-03-04 15:10:03 mh17 Exp $
+ * CVS info: $Id: zmapNavigator_P.h,v 1.7 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_NAVIGATOR_P_H
diff --git a/src/zmapDAS/zmapDAS1DSN.c b/src/zmapDAS/zmapDAS1DSN.c
index 94d15797f..465abb12b 100755
--- a/src/zmapDAS/zmapDAS1DSN.c
+++ b/src/zmapDAS/zmapDAS1DSN.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: May 24 17:07 2006 (rds)
* Created: Wed May 24 11:43:47 2006 (rds)
- * CVS info: $Id: zmapDAS1DSN.c,v 1.3 2010-03-04 15:10:04 mh17 Exp $
+ * CVS info: $Id: zmapDAS1DSN.c,v 1.4 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapDAS.h>
diff --git a/src/zmapDAS/zmapDAS1Parser.c b/src/zmapDAS/zmapDAS1Parser.c
index a30197361..14d8a5a18 100755
--- a/src/zmapDAS/zmapDAS1Parser.c
+++ b/src/zmapDAS/zmapDAS1Parser.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jun 27 17:50 2007 (rds)
* Created: Sun May 21 16:17:09 2006 (rds)
- * CVS info: $Id: zmapDAS1Parser.c,v 1.6 2010-03-04 15:10:05 mh17 Exp $
+ * CVS info: $Id: zmapDAS1Parser.c,v 1.7 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapDAS.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapDocs/ZMapMainPage.c b/src/zmapDocs/ZMapMainPage.c
index efc158c91..c80a24281 100755
--- a/src/zmapDocs/ZMapMainPage.c
+++ b/src/zmapDocs/ZMapMainPage.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Dummy file, contains main page documentation
* used by doxygen tool to document ZMap.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jan 14 17:23 2009 (edgrif)
* Created: Tue Apr 20 09:54:38 2004 (edgrif)
- * CVS info: $Id: ZMapMainPage.c,v 1.5 2010-03-04 15:10:06 mh17 Exp $
+ * CVS info: $Id: ZMapMainPage.c,v 1.6 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/*! \mainpage ZMap Code and Interface documentation.
*
* \section overview Overview
diff --git a/src/zmapDraw/zmapDraw.c b/src/zmapDraw/zmapDraw.c
index 9e75dddc9..072ebf888 100755
--- a/src/zmapDraw/zmapDraw.c
+++ b/src/zmapDraw/zmapDraw.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Draw objects into the canvas, these may be unnecessary
* if they map closely enough to the foo_canvas calls.
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Dec 2 15:02 2008 (rds)
* Created: Wed Oct 20 09:19:16 2004 (edgrif)
- * CVS info: $Id: zmapDraw.c,v 1.69 2010-04-15 11:19:03 mh17 Exp $
+ * CVS info: $Id: zmapDraw.c,v 1.70 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapDraw_P.h>
/* bitmap for doing the overlays, leads to diagonal lines allowing an element of "transparency".
diff --git a/src/zmapDraw/zmapDraw_P.h b/src/zmapDraw/zmapDraw_P.h
index 1db525939..2bb397c2e 100755
--- a/src/zmapDraw/zmapDraw_P.h
+++ b/src/zmapDraw/zmapDraw_P.h
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Mar 17 13:13 2006 (rds)
* Created: Mon Jul 18 09:14:38 2005 (rds)
- * CVS info: $Id: zmapDraw_P.h,v 1.7 2010-03-04 15:10:09 mh17 Exp $
+ * CVS info: $Id: zmapDraw_P.h,v 1.8 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_DRAW_P_H
diff --git a/src/zmapFeature/tests/check_zmapFeature.c b/src/zmapFeature/tests/check_zmapFeature.c
index 3a56c529b..d0a1c5e0b 100755
--- a/src/zmapFeature/tests/check_zmapFeature.c
+++ b/src/zmapFeature/tests/check_zmapFeature.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Mar 30 23:02 2009 (rds)
* Created: Mon Mar 30 14:49:19 2009 (rds)
- * CVS info: $Id: check_zmapFeature.c,v 1.2 2010-03-04 15:10:11 mh17 Exp $
+ * CVS info: $Id: check_zmapFeature.c,v 1.3 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <check_zmapFeature.h>
static ZMapFeatureTypeStyle style_G = NULL;
diff --git a/src/zmapFeature/tests/check_zmapFeature.h b/src/zmapFeature/tests/check_zmapFeature.h
index b895bd026..60ddf1cb8 100755
--- a/src/zmapFeature/tests/check_zmapFeature.h
+++ b/src/zmapFeature/tests/check_zmapFeature.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Mar 31 10:02 2009 (rds)
* Created: Mon Mar 30 20:45:32 2009 (rds)
- * CVS info: $Id: check_zmapFeature.h,v 1.2 2010-03-04 15:10:12 mh17 Exp $
+ * CVS info: $Id: check_zmapFeature.h,v 1.3 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapFeature/tests/check_zmapFeature_P.c b/src/zmapFeature/tests/check_zmapFeature_P.c
index 7fb75d793..cd0a4aec0 100755
--- a/src/zmapFeature/tests/check_zmapFeature_P.c
+++ b/src/zmapFeature/tests/check_zmapFeature_P.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,14 @@
* HISTORY:
* Last edited: Mar 30 14:49 2009 (rds)
* Created: Mon Mar 30 14:49:34 2009 (rds)
- * CVS info: $Id: check_zmapFeature_P.c,v 1.2 2010-03-04 15:10:13 mh17 Exp $
+ * CVS info: $Id: check_zmapFeature_P.c,v 1.3 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
diff --git a/src/zmapFeature/tests/check_zmapFeature_P.h b/src/zmapFeature/tests/check_zmapFeature_P.h
index e8b33fc63..c2ce6c935 100755
--- a/src/zmapFeature/tests/check_zmapFeature_P.h
+++ b/src/zmapFeature/tests/check_zmapFeature_P.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Mar 30 21:14 2009 (rds)
* Created: Mon Mar 30 21:13:11 2009 (rds)
- * CVS info: $Id: check_zmapFeature_P.h,v 1.2 2010-03-04 15:10:14 mh17 Exp $
+ * CVS info: $Id: check_zmapFeature_P.h,v 1.3 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapFeature/tests/check_zmapStyle.c b/src/zmapFeature/tests/check_zmapStyle.c
index 5489fd5e6..0c3126e71 100755
--- a/src/zmapFeature/tests/check_zmapStyle.c
+++ b/src/zmapFeature/tests/check_zmapStyle.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Mar 30 21:11 2009 (rds)
* Created: Wed Mar 25 22:05:26 2009 (rds)
- * CVS info: $Id: check_zmapStyle.c,v 1.2 2010-03-04 15:10:15 mh17 Exp $
+ * CVS info: $Id: check_zmapStyle.c,v 1.3 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <check_zmapStyle.h>
/* Unfortunately it looks like we rely on globals here... */
diff --git a/src/zmapFeature/tests/check_zmapStyle.h b/src/zmapFeature/tests/check_zmapStyle.h
index 3c4c5dd16..199913283 100755
--- a/src/zmapFeature/tests/check_zmapStyle.h
+++ b/src/zmapFeature/tests/check_zmapStyle.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Mar 31 10:03 2009 (rds)
* Created: Mon Mar 30 20:43:20 2009 (rds)
- * CVS info: $Id: check_zmapStyle.h,v 1.2 2010-03-04 15:10:16 mh17 Exp $
+ * CVS info: $Id: check_zmapStyle.h,v 1.3 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapFeature/tests/check_zmapStyle_P.c b/src/zmapFeature/tests/check_zmapStyle_P.c
index a9546c202..61d2f8516 100755
--- a/src/zmapFeature/tests/check_zmapStyle_P.c
+++ b/src/zmapFeature/tests/check_zmapStyle_P.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,14 @@
* HISTORY:
* Last edited: Mar 30 14:49 2009 (rds)
* Created: Mon Mar 30 14:49:53 2009 (rds)
- * CVS info: $Id: check_zmapStyle_P.c,v 1.2 2010-03-04 15:10:17 mh17 Exp $
+ * CVS info: $Id: check_zmapStyle_P.c,v 1.3 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
diff --git a/src/zmapFeature/tests/check_zmapStyle_P.h b/src/zmapFeature/tests/check_zmapStyle_P.h
index 674915678..f3dc22a7a 100755
--- a/src/zmapFeature/tests/check_zmapStyle_P.h
+++ b/src/zmapFeature/tests/check_zmapStyle_P.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Mar 30 21:16 2009 (rds)
* Created: Mon Mar 30 21:14:55 2009 (rds)
- * CVS info: $Id: check_zmapStyle_P.h,v 1.2 2010-03-04 15:10:18 mh17 Exp $
+ * CVS info: $Id: check_zmapStyle_P.h,v 1.3 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapFeature/zmapFeature.c b/src/zmapFeature/zmapFeature.c
index c369d6603..b3d8e5ff1 100755
--- a/src/zmapFeature/zmapFeature.c
+++ b/src/zmapFeature/zmapFeature.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements feature contexts, sets and features themselves.
* Includes code to create/merge/destroy contexts and sets.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Dec 14 11:20 2009 (edgrif)
* Created: Fri Jul 16 13:05:58 2004 (edgrif)
- * CVS info: $Id: zmapFeature.c,v 1.130 2010-06-08 08:31:23 mh17 Exp $
+ * CVS info: $Id: zmapFeature.c,v 1.131 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <strings.h>
#include <string.h>
diff --git a/src/zmapFeature/zmapFeature3FrameTranslation.c b/src/zmapFeature/zmapFeature3FrameTranslation.c
index 3f666f8f8..2b5031c64 100755
--- a/src/zmapFeature/zmapFeature3FrameTranslation.c
+++ b/src/zmapFeature/zmapFeature3FrameTranslation.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 1 19:01 2009 (rds)
* Created: Wed Apr 8 16:18:11 2009 (rds)
- * CVS info: $Id: zmapFeature3FrameTranslation.c,v 1.3 2010-03-04 15:10:20 mh17 Exp $
+ * CVS info: $Id: zmapFeature3FrameTranslation.c,v 1.4 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapPeptide.h>
#include <zmapFeature_P.h>
diff --git a/src/zmapFeature/zmapFeatureContext.c b/src/zmapFeature/zmapFeatureContext.c
index 12f8edef7..7db256dad 100755
--- a/src/zmapFeature/zmapFeatureContext.c
+++ b/src/zmapFeature/zmapFeatureContext.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions that operate on the feature context such as
* for reverse complementing.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Nov 30 16:23 2009 (edgrif)
* Created: Tue Jan 17 16:13:12 2006 (edgrif)
- * CVS info: $Id: zmapFeatureContext.c,v 1.54 2010-06-08 08:31:23 mh17 Exp $
+ * CVS info: $Id: zmapFeatureContext.c,v 1.55 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <glib.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapFeature/zmapFeatureContextUtils.c b/src/zmapFeature/zmapFeatureContextUtils.c
index b5209a123..913a980ac 100755
--- a/src/zmapFeature/zmapFeatureContextUtils.c
+++ b/src/zmapFeature/zmapFeatureContextUtils.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 31 09:56 2007 (edgrif)
* Created: Thu May 24 10:34:47 2007 (rds)
- * CVS info: $Id: zmapFeatureContextUtils.c,v 1.5 2010-03-04 15:10:22 mh17 Exp $
+ * CVS info: $Id: zmapFeatureContextUtils.c,v 1.6 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapFeature.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapFeature/zmapFeatureDNA.c b/src/zmapFeature/zmapFeatureDNA.c
index 385d59d6d..96c91e40c 100755
--- a/src/zmapFeature/zmapFeatureDNA.c
+++ b/src/zmapFeature/zmapFeatureDNA.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jul 15 09:04 2009 (rds)
* Created: Tue Apr 7 10:32:21 2009 (rds)
- * CVS info: $Id: zmapFeatureDNA.c,v 1.6 2010-04-22 14:31:53 mh17 Exp $
+ * CVS info: $Id: zmapFeatureDNA.c,v 1.7 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <zmapFeature_P.h>
diff --git a/src/zmapFeature/zmapFeatureData.c b/src/zmapFeature/zmapFeatureData.c
index 7dda2165a..47fd4fdb4 100755
--- a/src/zmapFeature/zmapFeatureData.c
+++ b/src/zmapFeature/zmapFeatureData.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Dec 17 11:04 2009 (edgrif)
* Created: Fri Jun 26 11:10:15 2009 (rds)
- * CVS info: $Id: zmapFeatureData.c,v 1.6 2010-03-04 15:10:24 mh17 Exp $
+ * CVS info: $Id: zmapFeatureData.c,v 1.7 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <glib-object.h>
#include <gobject/gvaluecollector.h>
diff --git a/src/zmapFeature/zmapFeatureFormatInput.c b/src/zmapFeature/zmapFeatureFormatInput.c
index 105aa5b94..4b913ef1e 100755
--- a/src/zmapFeature/zmapFeatureFormatInput.c
+++ b/src/zmapFeature/zmapFeatureFormatInput.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Routines to handle converting from Feature to Type and
* vice-versa.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Aug 28 10:26 2009 (edgrif)
* Created: Thu Sep 15 12:01:30 2005 (rds)
- * CVS info: $Id: zmapFeatureFormatInput.c,v 1.19 2010-03-04 15:10:25 mh17 Exp $
+ * CVS info: $Id: zmapFeatureFormatInput.c,v 1.20 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <zmapFeature_P.h>
diff --git a/src/zmapFeature/zmapFeatureOutput.c b/src/zmapFeature/zmapFeatureOutput.c
index a94d3b27b..be5c8701f 100755
--- a/src/zmapFeature/zmapFeatureOutput.c
+++ b/src/zmapFeature/zmapFeatureOutput.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 9 09:41 2010 (edgrif)
* Created: Tue Oct 28 16:20:33 2008 (rds)
- * CVS info: $Id: zmapFeatureOutput.c,v 1.13 2010-06-09 10:54:41 edgrif Exp $
+ * CVS info: $Id: zmapFeatureOutput.c,v 1.14 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <unistd.h> /* STDOUT_FILENO */
#include <string.h>
diff --git a/src/zmapFeature/zmapFeatureTypes.c b/src/zmapFeature/zmapFeatureTypes.c
index e4414bd18..70fd59c86 100755
--- a/src/zmapFeature/zmapFeatureTypes.c
+++ b/src/zmapFeature/zmapFeatureTypes.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions for manipulating Type structs and sets of
* type structs.c
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jan 26 12:02 2010 (edgrif)
* Created: Tue Dec 14 13:15:11 2004 (edgrif)
- * CVS info: $Id: zmapFeatureTypes.c,v 1.98 2010-06-08 08:31:23 mh17 Exp $
+ * CVS info: $Id: zmapFeatureTypes.c,v 1.99 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <memory.h>
diff --git a/src/zmapFeature/zmapFeatureUtils.c b/src/zmapFeature/zmapFeatureUtils.c
index ee1508077..b7bdc2e8f 100755
--- a/src/zmapFeature/zmapFeatureUtils.c
+++ b/src/zmapFeature/zmapFeatureUtils.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Utility routines for handling features/sets/blocks etc.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Sep 2 09:42 2009 (edgrif)
* Created: Tue Nov 2 2004 (rnc)
- * CVS info: $Id: zmapFeatureUtils.c,v 1.71 2010-06-09 11:25:53 mh17 Exp $
+ * CVS info: $Id: zmapFeatureUtils.c,v 1.72 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <unistd.h>
diff --git a/src/zmapFeature/zmapFeatureXML.c b/src/zmapFeature/zmapFeatureXML.c
index 730d64648..ef3c8556b 100755
--- a/src/zmapFeature/zmapFeatureXML.c
+++ b/src/zmapFeature/zmapFeatureXML.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Sep 1 17:24 2009 (edgrif)
* Created: Fri Jul 21 14:48:18 2006 (rds)
- * CVS info: $Id: zmapFeatureXML.c,v 1.12 2010-03-04 15:10:29 mh17 Exp $
+ * CVS info: $Id: zmapFeatureXML.c,v 1.13 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapXML.h>
diff --git a/src/zmapFeature/zmapFeature_P.h b/src/zmapFeature/zmapFeature_P.h
index 5b1b81fd4..e7af73df4 100755
--- a/src/zmapFeature/zmapFeature_P.h
+++ b/src/zmapFeature/zmapFeature_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Internals for zmapFeature routines.
*
* HISTORY:
* Last edited: May 10 08:06 2007 (edgrif)
* Created: Wed Nov 24 11:01:24 2004 (edgrif)
- * CVS info: $Id: zmapFeature_P.h,v 1.8 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapFeature_P.h,v 1.9 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_FEATURE_P_H
diff --git a/src/zmapFeature/zmapStyle.c b/src/zmapFeature/zmapStyle.c
index 366a7baaf..10d4bd7bc 100755
--- a/src/zmapFeature/zmapStyle.c
+++ b/src/zmapFeature/zmapStyle.c
@@ -21,17 +21,25 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements the zmapStyle GObject
*
* Exported functions: See ZMap/zmapStyle.h
*
- * CVS info: $Id: zmapStyle.c,v 1.54 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapStyle.c,v 1.55 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <zmapStyle_I.h>
diff --git a/src/zmapFeature/zmapStyleUtils.c b/src/zmapFeature/zmapStyleUtils.c
index 2a1457476..d7ad16bff 100755
--- a/src/zmapFeature/zmapStyleUtils.c
+++ b/src/zmapFeature/zmapStyleUtils.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Jul 29 09:53 2009 (edgrif)
* Created: Thu Oct 30 10:24:35 2008 (edgrif)
- * CVS info: $Id: zmapStyleUtils.c,v 1.18 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapStyleUtils.c,v 1.19 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <unistd.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapFeature/zmapStyle_I.h b/src/zmapFeature/zmapStyle_I.h
index 99f8644f1..d50702605 100755
--- a/src/zmapFeature/zmapStyle_I.h
+++ b/src/zmapFeature/zmapStyle_I.h
@@ -20,15 +20,16 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Private header for style.
*
* HISTORY:
* Last edited: May 14 13:46 2010 (edgrif)
* Created: Mon Feb 26 09:13:30 2007 (edgrif)
- * CVS info: $Id: zmapStyle_I.h,v 1.26 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapStyle_I.h,v 1.27 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapFeature/zmapStyle_P.h b/src/zmapFeature/zmapStyle_P.h
index 5484b356d..462223503 100755
--- a/src/zmapFeature/zmapStyle_P.h
+++ b/src/zmapFeature/zmapStyle_P.h
@@ -20,15 +20,16 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Private header for style.
*
* HISTORY:
* Last edited: Jun 13 17:33 2008 (rds)
* Created: Mon Feb 26 09:13:30 2007 (edgrif)
- * CVS info: $Id: zmapStyle_P.h,v 1.15 2010-03-15 11:00:39 mh17 Exp $
+ * CVS info: $Id: zmapStyle_P.h,v 1.16 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_STYLE_P_H
diff --git a/src/zmapGFF/gffparser.c b/src/zmapGFF/gffparser.c
index 93763f48a..c0e3a2883 100755
--- a/src/zmapGFF/gffparser.c
+++ b/src/zmapGFF/gffparser.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Nov 19 15:23 2009 (edgrif)
* Created: Wed Jan 11 11:30:39 2006 (rds)
- * CVS info: $Id: gffparser.c,v 1.11 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: gffparser.c,v 1.12 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
#include <stdio.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapGFF/zmapGFF2Dumper.c b/src/zmapGFF/zmapGFF2Dumper.c
index 1ff5187af..a7dbdab2a 100755
--- a/src/zmapGFF/zmapGFF2Dumper.c
+++ b/src/zmapGFF/zmapGFF2Dumper.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Dumps the features within a given block as GFF v2
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Apr 22 14:46 2010 (edgrif)
* Created: Mon Nov 14 13:21:14 2005 (edgrif)
- * CVS info: $Id: zmapGFF2Dumper.c,v 1.20 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapGFF2Dumper.c,v 1.21 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapFeature.h>
#include <ZMap/zmapGFF.h>
diff --git a/src/zmapGFF/zmapGFF2parser.c b/src/zmapGFF/zmapGFF2parser.c
index de828fc92..bfaf15e33 100755
--- a/src/zmapGFF/zmapGFF2parser.c
+++ b/src/zmapGFF/zmapGFF2parser.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: parser for GFF version 2 format.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jun 10 10:47 2010 (edgrif)
* Created: Fri May 28 14:25:12 2004 (edgrif)
- * CVS info: $Id: zmapGFF2parser.c,v 1.113 2010-06-10 09:48:26 edgrif Exp $
+ * CVS info: $Id: zmapGFF2parser.c,v 1.114 2010-06-14 15:40:13 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <string.h>
#include <errno.h>
diff --git a/src/zmapGFF/zmapGFF_P.h b/src/zmapGFF/zmapGFF_P.h
index 6eb6fa2ba..82a536d6e 100755
--- a/src/zmapGFF/zmapGFF_P.h
+++ b/src/zmapGFF/zmapGFF_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Internal types, functions etc. for the GFF parser,
* currently this parser only does GFF v2.
* HISTORY:
* Last edited: Apr 22 14:26 2010 (edgrif)
* Created: Sat May 29 13:18:32 2004 (edgrif)
- * CVS info: $Id: zmapGFF_P.h,v 1.23 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapGFF_P.h,v 1.24 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_GFF_P_H
diff --git a/src/zmapManager/zmapManager.c b/src/zmapManager/zmapManager.c
index d5fd10ad4..8142bd95f 100755
--- a/src/zmapManager/zmapManager.c
+++ b/src/zmapManager/zmapManager.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Handles a list of zmaps which it can delete and add
* to.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Oct 28 09:26 2009 (edgrif)
* Created: Thu Jul 24 16:06:44 2003 (edgrif)
- * CVS info: $Id: zmapManager.c,v 1.24 2010-03-04 15:10:39 mh17 Exp $
+ * CVS info: $Id: zmapManager.c,v 1.25 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <zmapManager_P.h>
diff --git a/src/zmapManager/zmapManager_P.h b/src/zmapManager/zmapManager_P.h
index 70aaf9c73..1bb680a75 100755
--- a/src/zmapManager/zmapManager_P.h
+++ b/src/zmapManager/zmapManager_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: Feb 17 09:48 2006 (edgrif)
* Created: Thu Jul 24 14:39:06 2003 (edgrif)
- * CVS info: $Id: zmapManager_P.h,v 1.8 2010-03-04 15:10:40 mh17 Exp $
+ * CVS info: $Id: zmapManager_P.h,v 1.9 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_MANAGER_P_H
diff --git a/src/zmapServer/acedb/acedbServer.c b/src/zmapServer/acedb/acedbServer.c
index 0cbc5434d..b45168f36 100755
--- a/src/zmapServer/acedb/acedbServer.c
+++ b/src/zmapServer/acedb/acedbServer.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements the method functions for a zmap server
* by making the appropriate calls to the acedb server.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 9 13:34 2010 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
- * CVS info: $Id: acedbServer.c,v 1.158 2010-06-09 13:25:34 edgrif Exp $
+ * CVS info: $Id: acedbServer.c,v 1.159 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <stdio.h>
#include <AceConn.h>
diff --git a/src/zmapServer/acedb/acedbServer_P.h b/src/zmapServer/acedb/acedbServer_P.h
index 62fab74e3..56ab6220c 100755
--- a/src/zmapServer/acedb/acedbServer_P.h
+++ b/src/zmapServer/acedb/acedbServer_P.h
@@ -19,14 +19,15 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* HISTORY:
* Last edited: Aug 28 09:47 2009 (edgrif)
* Created: Wed Mar 17 16:23:17 2004 (edgrif)
- * CVS info: $Id: acedbServer_P.h,v 1.24 2010-03-04 14:40:57 mh17 Exp $
+ * CVS info: $Id: acedbServer_P.h,v 1.25 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ACEDB_SERVER_P_H
diff --git a/src/zmapServer/das/dasServer.c b/src/zmapServer/das/dasServer.c
index 64e3cab58..afd321c69 100755
--- a/src/zmapServer/das/dasServer.c
+++ b/src/zmapServer/das/dasServer.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Connects to DAS v2 server to get data.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jan 14 10:10 2010 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
- * CVS info: $Id: dasServer.c,v 1.47 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: dasServer.c,v 1.48 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h> /* only for testing... */
#include <zmapServerPrototype.h>
diff --git a/src/zmapServer/das/dasServer_P.h b/src/zmapServer/das/dasServer_P.h
index 57d747f5b..49f0b7f79 100755
--- a/src/zmapServer/das/dasServer_P.h
+++ b/src/zmapServer/das/dasServer_P.h
@@ -19,14 +19,15 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* HISTORY:
* Last edited: Feb 4 15:02 2009 (edgrif)
* Created: Thu Mar 18 12:02:52 2004 (edgrif)
- * CVS info: $Id: dasServer_P.h,v 1.14 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: dasServer_P.h,v 1.15 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef DAS_SERVER_P_H
diff --git a/src/zmapServer/file/fileServer.c b/src/zmapServer/file/fileServer.c
index 3793fca5f..45bf0a1e0 100755
--- a/src/zmapServer/file/fileServer.c
+++ b/src/zmapServer/file/fileServer.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: These functions provide code to read a file as though
* it were a server according to the interface defined
@@ -34,10 +35,17 @@
* iff'ed out 07 Dec 2009 (mgh) - module replaced by pipeServer.c
* Last edited: Nov 27 15:41 2009 (edgrif)
* Created: Fri Sep 10 18:29:18 2004 (edgrif)
- * CVS info: $Id: fileServer.c,v 1.46 2010-05-17 14:41:15 mh17 Exp $
+ * CVS info: $Id: fileServer.c,v 1.47 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/* GFF files have a prescribed format which specifically does not include anything
* about how the features are displayed so the zmap styles must be provided separatly.
diff --git a/src/zmapServer/file/fileServer_P.h b/src/zmapServer/file/fileServer_P.h
index c7e8032b1..507ba9ddf 100755
--- a/src/zmapServer/file/fileServer_P.h
+++ b/src/zmapServer/file/fileServer_P.h
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Defines/types etc. for the file accessing version
* of the server code.
@@ -28,7 +29,7 @@
* HISTORY:
* Last edited: Oct 14 14:59 2008 (edgrif)
* Created: Fri Sep 10 18:42:18 2004 (edgrif)
- * CVS info: $Id: fileServer_P.h,v 1.7 2010-03-04 14:41:03 mh17 Exp $
+ * CVS info: $Id: fileServer_P.h,v 1.8 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef FILE_SERVER_P_H
diff --git a/src/zmapServer/pipe/pipeServer.c b/src/zmapServer/pipe/pipeServer.c
index 975f7c29f..41a937230 100755
--- a/src/zmapServer/pipe/pipeServer.c
+++ b/src/zmapServer/pipe/pipeServer.c
@@ -20,8 +20,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: These functions provide code to read the output of a script
* as though it were a server according to the interface defined
@@ -34,10 +35,17 @@
* HISTORY:
* Last edited: Jan 14 10:10 2010 (edgrif)
* Created: 2009-11-26 12:02:40 (mh17)
- * CVS info: $Id: pipeServer.c,v 1.24 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: pipeServer.c,v 1.25 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/* WARNING, THIS DOES NOT COPE WITH MULTIPLE ALIGNS/BLOCKS AS IT STANDS, TO DO THAT REQUIRES
* WORK BOTH ON THE GFF PARSER CODE (TO ACCEPT ALIGN/BLOCK ID/COORDS AND ON THIS CODE TO
diff --git a/src/zmapServer/pipe/pipeServer_P.h b/src/zmapServer/pipe/pipeServer_P.h
index a98c36d49..06a8708a1 100755
--- a/src/zmapServer/pipe/pipeServer_P.h
+++ b/src/zmapServer/pipe/pipeServer_P.h
@@ -20,15 +20,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Defines/types etc. for the file accessing version
* of the server code.
*
* HISTORY:
* Created: Thu Nov 26 10:30:21 2009 (mh17)
- * CVS info: $Id: pipeServer_P.h,v 1.10 2010-05-17 14:41:15 mh17 Exp $
+ * CVS info: $Id: pipeServer_P.h,v 1.11 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef PIPE_SERVER_P_H
diff --git a/src/zmapServer/zmapServer.c b/src/zmapServer/zmapServer.c
index 847011fb1..662382500 100755
--- a/src/zmapServer/zmapServer.c
+++ b/src/zmapServer/zmapServer.c
@@ -19,19 +19,27 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Simon Kelley (Sanger Institute, UK) srk@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Simon Kelley (Sanger Institute, UK) srk@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See ZMap/zmapServer.h
* HISTORY:
* Last edited: Jan 14 10:10 2010 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
- * CVS info: $Id: zmapServer.c,v 1.47 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapServer.c,v 1.48 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <strings.h>
#include <ZMap/zmapUrl.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapServer/zmapServer.h b/src/zmapServer/zmapServer.h
index 9f357df4e..8a680287a 100755
--- a/src/zmapServer/zmapServer.h
+++ b/src/zmapServer/zmapServer.h
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Generalised server interface, hides acedb/das/file
* details from caller.
@@ -28,7 +29,7 @@
* HISTORY:
* Last edited: Jan 14 10:20 2010 (edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
- * CVS info: $Id: zmapServer.h,v 1.20 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapServer.h,v 1.21 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SERVER_H
diff --git a/src/zmapServer/zmapServerProtocolHandler.c b/src/zmapServer/zmapServerProtocolHandler.c
index f289cf124..0a4955150 100755
--- a/src/zmapServer/zmapServerProtocolHandler.c
+++ b/src/zmapServer/zmapServerProtocolHandler.c
@@ -19,18 +19,26 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See ZMap/zmapServerProtocol.h
* HISTORY:
* Last edited: Jan 14 10:26 2010 (edgrif)
* Created: Thu Jan 27 13:17:43 2005 (edgrif)
- * CVS info: $Id: zmapServerProtocolHandler.c,v 1.61 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapServerProtocolHandler.c,v 1.62 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/* this file is a collection of code from zmapslave that needs to handle server connections...
* note that the thread stuff does percolate into this file as we need mutex locks.... */
diff --git a/src/zmapServer/zmapServerPrototype.h b/src/zmapServer/zmapServerPrototype.h
index 1f13a4558..caa5bf8de 100755
--- a/src/zmapServer/zmapServerPrototype.h
+++ b/src/zmapServer/zmapServerPrototype.h
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk &
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk &,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Describes the interface between zmapServer, the generalised
* server interface and the underlying server specific
@@ -30,7 +31,7 @@
* HISTORY:
* Last edited: Jan 14 09:51 2010 (edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
- * CVS info: $Id: zmapServerPrototype.h,v 1.36 2010-06-08 08:31:24 mh17 Exp $
+ * CVS info: $Id: zmapServerPrototype.h,v 1.37 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SERVER_PROTOTYPEP_H
diff --git a/src/zmapServer/zmapServer_P.h b/src/zmapServer/zmapServer_P.h
index 1be637d94..2cd14115b 100755
--- a/src/zmapServer/zmapServer_P.h
+++ b/src/zmapServer/zmapServer_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: 2009-11-26 12:57:59 (mgh)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
- * CVS info: $Id: zmapServer_P.h,v 1.13 2010-03-04 14:41:00 mh17 Exp $
+ * CVS info: $Id: zmapServer_P.h,v 1.14 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SERVER_P_H
diff --git a/src/zmapThreads/zmapSlave.c b/src/zmapThreads/zmapSlave.c
index bd7a3f212..fd53a6c58 100755
--- a/src/zmapThreads/zmapSlave.c
+++ b/src/zmapThreads/zmapSlave.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: This code is called when a new thread is created by the
* zmapThread code, it loops waiting for commands from
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Jun 10 16:57 2010 (edgrif)
* Created: Thu Jul 24 14:37:26 2003 (edgrif)
- * CVS info: $Id: zmapSlave.c,v 1.35 2010-06-11 10:51:30 edgrif Exp $
+ * CVS info: $Id: zmapSlave.c,v 1.36 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <strings.h>
diff --git a/src/zmapThreads/zmapSlave.test.c b/src/zmapThreads/zmapSlave.test.c
index 8b312eacb..f3e8e98ce 100755
--- a/src/zmapThreads/zmapSlave.test.c
+++ b/src/zmapThreads/zmapSlave.test.c
@@ -19,19 +19,27 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Simon Kelley (Sanger Institute, UK) srk@sanger.ac.uk
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Simon Kelley (Sanger Institute, UK) srk@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: Jul 21 17:01 2004 (edgrif)
* Created: Thu Jul 24 14:37:26 2003 (edgrif)
- * CVS info: $Id: zmapSlave.test.c,v 1.5 2010-03-04 15:10:51 mh17 Exp $
+ * CVS info: $Id: zmapSlave.test.c,v 1.6 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/* With some additional calls in the zmapConn code I could get rid of the need for
* the private header here...... */
diff --git a/src/zmapThreads/zmapSlave_P.h b/src/zmapThreads/zmapSlave_P.h
index d58a7da5e..a370cd1ad 100755
--- a/src/zmapThreads/zmapSlave_P.h
+++ b/src/zmapThreads/zmapSlave_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Simon Kelley (Sanger Institute, UK) srk@sanger.ac.uk and
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Simon Kelley (Sanger Institute, UK) srk@sanger.ac.uk and,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* HISTORY:
* Last edited: Feb 2 11:30 2005 (edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
- * CVS info: $Id: zmapSlave_P.h,v 1.9 2010-03-04 15:10:52 mh17 Exp $
+ * CVS info: $Id: zmapSlave_P.h,v 1.10 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SLAVE_P_H
diff --git a/src/zmapThreads/zmapThreads.c b/src/zmapThreads/zmapThreads.c
index c632cf45a..63ed56b4a 100755
--- a/src/zmapThreads/zmapThreads.c
+++ b/src/zmapThreads/zmapThreads.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Code to implement communcation between a control
* thread and a slave thread. This code knows nothing
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Mar 20 12:09 2009 (edgrif)
* Created: Thu Jan 27 11:25:37 2005 (edgrif)
- * CVS info: $Id: zmapThreads.c,v 1.12 2010-06-14 10:39:05 mh17 Exp $
+ * CVS info: $Id: zmapThreads.c,v 1.13 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <string.h>
#include <signal.h>
diff --git a/src/zmapThreads/zmapThreadsUtils.c b/src/zmapThreads/zmapThreadsUtils.c
index 61f40c8b7..19f6fa610 100755
--- a/src/zmapThreads/zmapThreadsUtils.c
+++ b/src/zmapThreads/zmapThreadsUtils.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Utility functions for the slave thread interface.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jan 12 09:52 2010 (edgrif)
* Created: Thu Jan 27 11:50:01 2005 (edgrif)
- * CVS info: $Id: zmapThreadsUtils.c,v 1.6 2010-03-04 15:10:54 mh17 Exp $
+ * CVS info: $Id: zmapThreadsUtils.c,v 1.7 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <errno.h>
#include <time.h>
diff --git a/src/zmapThreads/zmapThreads_P.h b/src/zmapThreads/zmapThreads_P.h
index 0b937124f..1a59410fe 100755
--- a/src/zmapThreads/zmapThreads_P.h
+++ b/src/zmapThreads/zmapThreads_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Internals for the thread control code.
*
* HISTORY:
* Last edited: Mar 20 11:53 2009 (edgrif)
* Created: Thu Jan 27 11:18:44 2005 (edgrif)
- * CVS info: $Id: zmapThreads_P.h,v 1.9 2010-03-04 15:10:55 mh17 Exp $
+ * CVS info: $Id: zmapThreads_P.h,v 1.10 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_THREAD_PRIV_H
diff --git a/src/zmapUtils/safe-ctype.c b/src/zmapUtils/safe-ctype.c
index 518af24f4..257c6143b 100755
--- a/src/zmapUtils/safe-ctype.c
+++ b/src/zmapUtils/safe-ctype.c
@@ -30,6 +30,13 @@ modify this file, you may extend this exception to your version of the
file, but you are not obligated to do so. If you do not wish to do
so, delete this exception statement from your version. */
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/* This is a compatible replacement of the standard C library's <ctype.h>
with the following properties:
diff --git a/src/zmapUtils/tests/check_zmapConfigLoader.c b/src/zmapUtils/tests/check_zmapConfigLoader.c
index f27eb222a..63e0e6f5e 100755
--- a/src/zmapUtils/tests/check_zmapConfigLoader.c
+++ b/src/zmapUtils/tests/check_zmapConfigLoader.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Apr 3 16:30 2009 (rds)
* Created: Fri Apr 3 10:47:20 2009 (rds)
- * CVS info: $Id: check_zmapConfigLoader.c,v 1.2 2010-03-04 15:10:56 mh17 Exp $
+ * CVS info: $Id: check_zmapConfigLoader.c,v 1.3 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <check_zmapConfigLoader.h>
diff --git a/src/zmapUtils/tests/check_zmapConfigLoader.h b/src/zmapUtils/tests/check_zmapConfigLoader.h
index 7f534c4d4..7fd7462c3 100755
--- a/src/zmapUtils/tests/check_zmapConfigLoader.h
+++ b/src/zmapUtils/tests/check_zmapConfigLoader.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Apr 3 14:34 2009 (rds)
* Created: Fri Apr 3 10:53:42 2009 (rds)
- * CVS info: $Id: check_zmapConfigLoader.h,v 1.3 2010-03-04 15:10:57 mh17 Exp $
+ * CVS info: $Id: check_zmapConfigLoader.h,v 1.4 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapUtils/zmapBase.c b/src/zmapUtils/zmapBase.c
index 66c75cc94..e80245e5b 100755
--- a/src/zmapUtils/zmapBase.c
+++ b/src/zmapUtils/zmapBase.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jan 12 11:52 2009 (rds)
* Created: Thu Jun 12 12:02:12 2008 (rds)
- * CVS info: $Id: zmapBase.c,v 1.11 2010-03-29 15:32:40 mh17 Exp $
+ * CVS info: $Id: zmapBase.c,v 1.12 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#if MH17_NOT_NEEDED
#include <zmapBase_I.h>
diff --git a/src/zmapUtils/zmapBase_I.h b/src/zmapUtils/zmapBase_I.h
index 827973061..3c862c38f 100755
--- a/src/zmapUtils/zmapBase_I.h
+++ b/src/zmapUtils/zmapBase_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jan 12 10:03 2009 (rds)
* Created: Thu Jun 12 12:02:56 2008 (rds)
- * CVS info: $Id: zmapBase_I.h,v 1.6 2010-03-29 15:32:40 mh17 Exp $
+ * CVS info: $Id: zmapBase_I.h,v 1.7 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapUtils/zmapCmdLineArgs.c b/src/zmapUtils/zmapCmdLineArgs.c
index 20b9bf45d..4324ac7c7 100755
--- a/src/zmapUtils/zmapCmdLineArgs.c
+++ b/src/zmapUtils/zmapCmdLineArgs.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Creates a global object that contains command line
* args, the init function should be called once at
@@ -32,10 +33,17 @@
* HISTORY:
* Last edited: Feb 11 09:54 2009 (edgrif)
* Created: Fri Feb 4 18:24:37 2005 (edgrif)
- * CVS info: $Id: zmapCmdLineArgs.c,v 1.14 2010-03-04 15:11:01 mh17 Exp $
+ * CVS info: $Id: zmapCmdLineArgs.c,v 1.15 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdlib.h>
#include <string.h>
#include <glib.h>
diff --git a/src/zmapUtils/zmapCmdLineArgs_P.h b/src/zmapUtils/zmapCmdLineArgs_P.h
index a6989be08..390663e62 100755
--- a/src/zmapUtils/zmapCmdLineArgs_P.h
+++ b/src/zmapUtils/zmapCmdLineArgs_P.h
@@ -19,16 +19,17 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Internals for command line parsing.
*
* HISTORY:
* Last edited: May 12 17:07 2008 (rds)
* Created: Fri Feb 4 19:11:23 2005 (edgrif)
- * CVS info: $Id: zmapCmdLineArgs_P.h,v 1.7 2010-03-04 15:11:02 mh17 Exp $
+ * CVS info: $Id: zmapCmdLineArgs_P.h,v 1.8 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_CMDLINEARGS_P_H
diff --git a/src/zmapUtils/zmapCoords.c b/src/zmapUtils/zmapCoords.c
index 673c306bf..5d8170550 100755
--- a/src/zmapUtils/zmapCoords.c
+++ b/src/zmapUtils/zmapCoords.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Various coordinate transforming functions.
*
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Nov 18 15:58 2009 (edgrif)
* Created: Tue Nov 17 13:29:50 2009 (edgrif)
- * CVS info: $Id: zmapCoords.c,v 1.2 2010-03-04 15:11:03 mh17 Exp $
+ * CVS info: $Id: zmapCoords.c,v 1.3 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
diff --git a/src/zmapUtils/zmapDNA.c b/src/zmapUtils/zmapDNA.c
index db1dc48a3..94895cf3d 100755
--- a/src/zmapUtils/zmapDNA.c
+++ b/src/zmapUtils/zmapDNA.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Mar 10 17:18 2010 (edgrif)
* Created: Fri Oct 6 11:41:38 2006 (edgrif)
- * CVS info: $Id: zmapDNA.c,v 1.11 2010-03-12 14:45:49 edgrif Exp $
+ * CVS info: $Id: zmapDNA.c,v 1.12 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapSequence.h>
diff --git a/src/zmapUtils/zmapFASTA.c b/src/zmapUtils/zmapFASTA.c
index 33e233601..94981a13d 100755
--- a/src/zmapUtils/zmapFASTA.c
+++ b/src/zmapUtils/zmapFASTA.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions to handle FASTA format.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Apr 15 08:57 2010 (edgrif)
* Created: Fri Mar 17 16:24:30 2006 (edgrif)
- * CVS info: $Id: zmapFASTA.c,v 1.7 2010-04-19 14:25:50 edgrif Exp $
+ * CVS info: $Id: zmapFASTA.c,v 1.8 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapFASTA.h>
diff --git a/src/zmapUtils/zmapFileUtils.c b/src/zmapUtils/zmapFileUtils.c
index 0a55206b3..2b4b4a09c 100755
--- a/src/zmapUtils/zmapFileUtils.c
+++ b/src/zmapUtils/zmapFileUtils.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Set of file handling utilities.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Sep 2 10:54 2009 (edgrif)
* Created: Thu May 6 15:16:05 2004 (edgrif)
- * CVS info: $Id: zmapFileUtils.c,v 1.12 2010-03-04 15:11:06 mh17 Exp $
+ * CVS info: $Id: zmapFileUtils.c,v 1.13 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/zmapUtils/zmapFooUtils.c b/src/zmapUtils/zmapFooUtils.c
index a63971f03..36957976b 100755
--- a/src/zmapUtils/zmapFooUtils.c
+++ b/src/zmapUtils/zmapFooUtils.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Some utility routines for operating on the Foocanvas
* which were not implemented by the foocanvas itself.
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Jul 11 09:45 2007 (edgrif)
* Created: Mon Apr 2 12:37:41 2007 (rds)
- * CVS info: $Id: zmapFooUtils.c,v 1.3 2010-03-04 15:11:07 mh17 Exp $
+ * CVS info: $Id: zmapFooUtils.c,v 1.4 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtilsFoo.h>
#include <ZMap/zmapUtilsGUI.h>
#include <zmapUtils_P.h>
diff --git a/src/zmapUtils/zmapGLibUtils.c b/src/zmapUtils/zmapGLibUtils.c
index 302c63f35..71ba72404 100755
--- a/src/zmapUtils/zmapGLibUtils.c
+++ b/src/zmapUtils/zmapGLibUtils.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: A collection of "add-ons" to GLib that seem useful.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jun 12 08:44 2009 (edgrif)
* Created: Thu Oct 13 15:22:35 2005 (edgrif)
- * CVS info: $Id: zmapGLibUtils.c,v 1.34 2010-06-08 08:31:25 mh17 Exp $
+ * CVS info: $Id: zmapGLibUtils.c,v 1.35 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <string.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapUtils/zmapGUINotebook.c b/src/zmapUtils/zmapGUINotebook.c
index 2d973856a..867c6b9c0 100755
--- a/src/zmapUtils/zmapGUINotebook.c
+++ b/src/zmapUtils/zmapGUINotebook.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements general convenience routines for creating
* a GTK Notebook widget and the pages/fields within
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Nov 19 20:59 2008 (rds)
* Created: Wed Oct 24 10:08:38 2007 (edgrif)
- * CVS info: $Id: zmapGUINotebook.c,v 1.22 2010-03-04 15:11:09 mh17 Exp $
+ * CVS info: $Id: zmapGUINotebook.c,v 1.23 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapUtils/zmapGUITreeView.c b/src/zmapUtils/zmapGUITreeView.c
index 643ea668c..4eb772dd1 100755
--- a/src/zmapUtils/zmapGUITreeView.c
+++ b/src/zmapUtils/zmapGUITreeView.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 22 10:41 2009 (rds)
* Created: Thu May 22 10:00:37 2008 (rds)
- * CVS info: $Id: zmapGUITreeView.c,v 1.10 2010-03-15 11:00:39 mh17 Exp $
+ * CVS info: $Id: zmapGUITreeView.c,v 1.11 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h> /* memcpy() */
diff --git a/src/zmapUtils/zmapGUITreeView_I.h b/src/zmapUtils/zmapGUITreeView_I.h
index 35fd03911..67511a253 100755
--- a/src/zmapUtils/zmapGUITreeView_I.h
+++ b/src/zmapUtils/zmapGUITreeView_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 3 11:45 2008 (rds)
* Created: Thu May 22 10:49:23 2008 (rds)
- * CVS info: $Id: zmapGUITreeView_I.h,v 1.5 2010-03-15 11:00:39 mh17 Exp $
+ * CVS info: $Id: zmapGUITreeView_I.h,v 1.6 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapUtils/zmapGUImenus.c b/src/zmapUtils/zmapGUImenus.c
index a672fa41d..9e0785140 100755
--- a/src/zmapUtils/zmapGUImenus.c
+++ b/src/zmapUtils/zmapGUImenus.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Code to construct GTK menus in a (hopefully) more
* straight forward way.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Nov 3 14:39 2008 (rds)
* Created: Thu Jan 12 10:59:24 2006 (edgrif)
- * CVS info: $Id: zmapGUImenus.c,v 1.12 2010-03-04 15:11:12 mh17 Exp $
+ * CVS info: $Id: zmapGUImenus.c,v 1.13 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <zmapUtils_P.h>
#include <ZMap/zmapUtilsGUI.h>
diff --git a/src/zmapUtils/zmapGUIutils.c b/src/zmapUtils/zmapGUIutils.c
index d69790915..c712b48ce 100755
--- a/src/zmapUtils/zmapGUIutils.c
+++ b/src/zmapUtils/zmapGUIutils.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Various GUI convenience functions for messages, text,
* notebook creation and so on.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 9 15:02 2009 (edgrif)
* Created: Thu Jul 24 14:37:35 2003 (edgrif)
- * CVS info: $Id: zmapGUIutils.c,v 1.57 2010-03-04 15:11:13 mh17 Exp $
+ * CVS info: $Id: zmapGUIutils.c,v 1.58 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <gtk/gtk.h>
#include <math.h>
diff --git a/src/zmapUtils/zmapHandle.c b/src/zmapUtils/zmapHandle.c
index e8bc3831a..57ddda4ab 100755
--- a/src/zmapUtils/zmapHandle.c
+++ b/src/zmapUtils/zmapHandle.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Rewrite of acedb's "handle" system for freeing loads of
* memory with one call.
@@ -33,10 +34,17 @@
* HISTORY:
* Last edited: May 5 11:21 2006 (rds)
* Created: Tue Nov 29 15:27:32 2005 (edgrif)
- * CVS info: $Id: zmapHandle.c,v 1.5 2010-03-04 15:11:14 mh17 Exp $
+ * CVS info: $Id: zmapHandle.c,v 1.6 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapUtilsHandle.h>
diff --git a/src/zmapUtils/zmapIOOut.c b/src/zmapUtils/zmapIOOut.c
index 1976d2ade..0385af706 100755
--- a/src/zmapUtils/zmapIOOut.c
+++ b/src/zmapUtils/zmapIOOut.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Supports output to strings or files (sockets, files etc.)
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Sep 2 16:05 2008 (rds)
* Created: Mon Oct 15 13:50:02 2007 (edgrif)
- * CVS info: $Id: zmapIOOut.c,v 1.3 2010-03-04 15:11:15 mh17 Exp $
+ * CVS info: $Id: zmapIOOut.c,v 1.4 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <zmapIO_P.h>
diff --git a/src/zmapUtils/zmapIO_P.h b/src/zmapUtils/zmapIO_P.h
index fb0c627b8..8d8c19aa1 100755
--- a/src/zmapUtils/zmapIO_P.h
+++ b/src/zmapUtils/zmapIO_P.h
@@ -20,15 +20,16 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Private header for IO package.
*
* HISTORY:
* Last edited: Oct 17 10:27 2007 (edgrif)
* Created: Mon Oct 15 13:56:41 2007 (edgrif)
- * CVS info: $Id: zmapIO_P.h,v 1.2 2010-03-04 15:11:16 mh17 Exp $
+ * CVS info: $Id: zmapIO_P.h,v 1.3 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_IO_P_H
diff --git a/src/zmapUtils/zmapLogging.c b/src/zmapUtils/zmapLogging.c
index 02d4102b7..317c58ef1 100755
--- a/src/zmapUtils/zmapLogging.c
+++ b/src/zmapUtils/zmapLogging.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Log functions for zmap app. Allows start/stop, switching
* on/off. Currently there is just one global log for the
@@ -31,9 +32,16 @@
* HISTORY:
* Last edited: Nov 27 12:02 2009 (edgrif)
* Created: Tue Apr 17 15:47:10 2007 (edgrif)
- * CVS info: $Id: zmapLogging.c,v 1.24 2010-03-04 15:11:17 mh17 Exp $
+ * CVS info: $Id: zmapLogging.c,v 1.25 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+
+#include <ZMap/zmap.h>
+
+
+
+
+
#ifdef HAVE_CONFIG_H
#include <config.h> /* config generated by configure */
#endif
diff --git a/src/zmapUtils/zmapPeptide.c b/src/zmapUtils/zmapPeptide.c
index ed44d9942..742a8ec23 100755
--- a/src/zmapUtils/zmapPeptide.c
+++ b/src/zmapUtils/zmapPeptide.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Routines to translate DNA to peptide, optionally with
* an alternative genetic code.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 1 15:05 2008 (rds)
* Created: Mon Mar 13 11:43:42 2006 (edgrif)
- * CVS info: $Id: zmapPeptide.c,v 1.16 2010-03-04 15:11:18 mh17 Exp $
+ * CVS info: $Id: zmapPeptide.c,v 1.17 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/*
*
diff --git a/src/zmapUtils/zmapReadLine.c b/src/zmapUtils/zmapReadLine.c
index 5e6b57068..3836c1dcd 100755
--- a/src/zmapUtils/zmapReadLine.c
+++ b/src/zmapUtils/zmapReadLine.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Package to read lines from a string, currently this
* is done by altering the string, the code to do this
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Apr 22 13:15 2010 (edgrif)
* Created: Thu Jun 24 19:03:50 2004 (edgrif)
- * CVS info: $Id: zmapReadLine.c,v 1.5 2010-04-22 12:16:03 edgrif Exp $
+ * CVS info: $Id: zmapReadLine.c,v 1.6 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
#include <zmapReadLine_P.h>
diff --git a/src/zmapUtils/zmapReadLine_P.h b/src/zmapUtils/zmapReadLine_P.h
index efe93af7a..d13807a44 100755
--- a/src/zmapUtils/zmapReadLine_P.h
+++ b/src/zmapUtils/zmapReadLine_P.h
@@ -19,14 +19,15 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Internal data structs for the line reading package.
* HISTORY:
* Last edited: Jun 25 10:05 2004 (edgrif)
* Created: Thu Jun 24 19:33:38 2004 (edgrif)
- * CVS info: $Id: zmapReadLine_P.h,v 1.3 2010-03-04 15:11:21 mh17 Exp $
+ * CVS info: $Id: zmapReadLine_P.h,v 1.4 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapUtils/zmapSeqBitmap.c b/src/zmapUtils/zmapSeqBitmap.c
index 5503dc74a..0b9b5c2e8 100755
--- a/src/zmapUtils/zmapSeqBitmap.c
+++ b/src/zmapUtils/zmapSeqBitmap.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Apr 16 09:26 2009 (edgrif)
* Created: Tue Feb 17 09:50:34 2009 (rds)
- * CVS info: $Id: zmapSeqBitmap.c,v 1.3 2010-03-04 15:11:22 mh17 Exp $
+ * CVS info: $Id: zmapSeqBitmap.c,v 1.4 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <glib.h>
#include <ZMap/zmapSeqBitmap.h>
diff --git a/src/zmapUtils/zmapSequence.c b/src/zmapUtils/zmapSequence.c
index d976d1f2a..8b45ce15e 100755
--- a/src/zmapUtils/zmapSequence.c
+++ b/src/zmapUtils/zmapSequence.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Sep 27 14:07 2007 (edgrif)
* Created: Thu Sep 27 10:48:11 2007 (edgrif)
- * CVS info: $Id: zmapSequence.c,v 1.2 2010-03-04 15:11:23 mh17 Exp $
+ * CVS info: $Id: zmapSequence.c,v 1.3 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapSequence.h>
diff --git a/src/zmapUtils/zmapString.c b/src/zmapUtils/zmapString.c
index 88fa4b8d9..77bfbe156 100755
--- a/src/zmapUtils/zmapString.c
+++ b/src/zmapUtils/zmapString.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Ideally we wouldn't have this but instead use an
* existing library but that's not always so easy.
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Jun 17 12:21 2008 (rds)
* Created: Thu Sep 20 15:21:42 2007 (edgrif)
- * CVS info: $Id: zmapString.c,v 1.3 2010-03-04 15:11:24 mh17 Exp $
+ * CVS info: $Id: zmapString.c,v 1.4 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapString.h>
#include <string.h>
diff --git a/src/zmapUtils/zmapUrl.c b/src/zmapUtils/zmapUrl.c
index fbbae652c..313d38c59 100755
--- a/src/zmapUtils/zmapUrl.c
+++ b/src/zmapUtils/zmapUrl.c
@@ -1,5 +1,12 @@
/* Last edited: 2009-11-26 12:56:38 (mgh) */
/* Last edited: Aug 31 11:41 2005 (rds) */
+
+#include <ZMap/zmap.h>
+
+
+
+
+
/* URL handling.
Copyright (C) 1995, 1996, 1997, 2000, 2001, 2003, 2003
Free Software Foundation, Inc.
diff --git a/src/zmapUtils/zmapUrlUtils.c b/src/zmapUtils/zmapUrlUtils.c
index 258cd289e..f04a08dbc 100755
--- a/src/zmapUtils/zmapUrlUtils.c
+++ b/src/zmapUtils/zmapUrlUtils.c
@@ -29,6 +29,13 @@ modify this file, you may extend this exception to your version of the
file, but you are not obligated to do so. If you do not wish to do
so, delete this exception statement from your version. */
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <config.h>
#include <stdio.h>
diff --git a/src/zmapUtils/zmapUtils.c b/src/zmapUtils/zmapUtils.c
index 5f54188ac..b8ff8219f 100755
--- a/src/zmapUtils/zmapUtils.c
+++ b/src/zmapUtils/zmapUtils.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Utility functions for the ZMap code.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jun 5 17:55 2009 (edgrif)
* Created: Fri Mar 12 08:16:24 2004 (edgrif)
- * CVS info: $Id: zmapUtils.c,v 1.34 2010-06-08 08:31:25 mh17 Exp $
+ * CVS info: $Id: zmapUtils.c,v 1.35 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#define _ISOC99_SOURCE
#include <sys/wait.h>
diff --git a/src/zmapUtils/zmapUtilsConfig.c b/src/zmapUtils/zmapUtilsConfig.c
index 85a82bf48..0d5f0cf1f 100755
--- a/src/zmapUtils/zmapUtilsConfig.c
+++ b/src/zmapUtils/zmapUtilsConfig.c
@@ -19,18 +19,26 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: Oct 1 16:07 2008 (rds)
* Created: Mon Oct 18 09:05:27 2004 (edgrif)
- * CVS info: $Id: zmapUtilsConfig.c,v 1.8 2010-06-08 08:31:25 mh17 Exp $
+ * CVS info: $Id: zmapUtilsConfig.c,v 1.9 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapConfigIni.h>
#include <ZMap/zmapConfigStrings.h>
diff --git a/src/zmapUtils/zmapUtilsSpawn.c b/src/zmapUtils/zmapUtilsSpawn.c
index 68e484814..4c03eebb3 100755
--- a/src/zmapUtils/zmapUtilsSpawn.c
+++ b/src/zmapUtils/zmapUtilsSpawn.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,9 +30,16 @@
* HISTORY:
* Last edited: Sep 27 10:59 2007 (rds)
* Created: Thu Sep 27 08:50:11 2007 (rds)
- * CVS info: $Id: zmapUtilsSpawn.c,v 1.3 2010-03-04 15:11:29 mh17 Exp $
+ * CVS info: $Id: zmapUtilsSpawn.c,v 1.4 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+
+#include <ZMap/zmap.h>
+
+
+
+
+
#if 0
commented out by malcolm 2009-11-30 14:52:12
diff --git a/src/zmapUtils/zmapUtilsUsers.c b/src/zmapUtils/zmapUtilsUsers.c
index 5af63ea70..3f72d1917 100755
--- a/src/zmapUtils/zmapUtilsUsers.c
+++ b/src/zmapUtils/zmapUtilsUsers.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Contains routines for various handling of users.
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Feb 17 12:02 2010 (edgrif)
* Created: Fri Dec 12 13:14:55 2008 (edgrif)
- * CVS info: $Id: zmapUtilsUsers.c,v 1.5 2010-03-04 15:11:30 mh17 Exp $
+ * CVS info: $Id: zmapUtilsUsers.c,v 1.6 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <sys/utsname.h>
#include <netdb.h>
diff --git a/src/zmapUtils/zmapUtils_P.h b/src/zmapUtils/zmapUtils_P.h
index 10dbdae1e..4dfeb41a4 100755
--- a/src/zmapUtils/zmapUtils_P.h
+++ b/src/zmapUtils/zmapUtils_P.h
@@ -19,14 +19,15 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* HISTORY:
* Last edited: May 6 15:50 2010 (edgrif)
* Created: Wed Mar 31 11:53:45 2004 (edgrif)
- * CVS info: $Id: zmapUtils_P.h,v 1.136 2010-05-25 14:17:01 mh17 Exp $
+ * CVS info: $Id: zmapUtils_P.h,v 1.137 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_UTILS_P_H
diff --git a/src/zmapUtils/zmapWebBrowser.c b/src/zmapUtils/zmapWebBrowser.c
index c5080b09d..dbec85335 100755
--- a/src/zmapUtils/zmapWebBrowser.c
+++ b/src/zmapUtils/zmapWebBrowser.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions to display a url in a web browser.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Feb 18 16:27 2010 (edgrif)
* Created: Thu Mar 23 13:35:10 2006 (edgrif)
- * CVS info: $Id: zmapWebBrowser.c,v 1.11 2010-03-04 15:11:32 mh17 Exp $
+ * CVS info: $Id: zmapWebBrowser.c,v 1.12 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <sys/utsname.h>
#include <glib.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapUtils/zmapXRemoteUtils.c b/src/zmapUtils/zmapXRemoteUtils.c
index 149bb77c6..6bb3b86e2 100755
--- a/src/zmapUtils/zmapXRemoteUtils.c
+++ b/src/zmapUtils/zmapXRemoteUtils.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Provides utility functions for xremote stuff...actually should
* stuff really be here...maybe it should all be in
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Mar 29 11:20 2010 (edgrif)
* Created: Tue Jul 10 09:09:53 2007 (rds)
- * CVS info: $Id: zmapXRemoteUtils.c,v 1.11 2010-03-29 10:22:56 edgrif Exp $
+ * CVS info: $Id: zmapXRemoteUtils.c,v 1.12 2010-06-14 15:40:14 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtilsXRemote.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapView/zmapView.c b/src/zmapView/zmapView.c
index 1d9c2dbd8..f9f64b20c 100755
--- a/src/zmapView/zmapView.c
+++ b/src/zmapView/zmapView.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Handles the getting of the feature context from sources
* and their subsequent processing.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 9 17:43 2010 (edgrif)
* Created: Thu May 13 15:28:26 2004 (edgrif)
- * CVS info: $Id: zmapView.c,v 1.204 2010-06-14 10:39:05 mh17 Exp $
+ * CVS info: $Id: zmapView.c,v 1.205 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <sys/types.h>
#include <signal.h> /* kill() */
diff --git a/src/zmapView/zmapViewCallBlixem.c b/src/zmapView/zmapViewCallBlixem.c
index 59a272546..7f77cbdcc 100755
--- a/src/zmapView/zmapViewCallBlixem.c
+++ b/src/zmapView/zmapViewCallBlixem.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: prepares input files in FASTA, seqbl and exblx format
* and then passes them to blixem for display.
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Feb 9 13:24 2010 (edgrif)
* Created: Thu Jun 28 18:10:08 2007 (edgrif)
- * CVS info: $Id: zmapViewCallBlixem.c,v 1.30 2010-05-17 14:41:15 mh17 Exp $
+ * CVS info: $Id: zmapViewCallBlixem.c,v 1.31 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <unistd.h> /* for getlogin() */
#include <string.h> /* for memcpy */
#include <sys/types.h> /* for chmod() */
diff --git a/src/zmapView/zmapViewRemoteReceive.c b/src/zmapView/zmapViewRemoteReceive.c
index 97354badd..542b0b9e7 100755
--- a/src/zmapView/zmapViewRemoteReceive.c
+++ b/src/zmapView/zmapViewRemoteReceive.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Receives and interprets xremote messages delivered from
* a peer application set up to interact with zmap.
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Apr 30 13:15 2010 (edgrif)
* Created: Tue Jul 10 21:02:42 2007 (rds)
- * CVS info: $Id: zmapViewRemoteReceive.c,v 1.49 2010-06-10 10:25:50 mh17 Exp $
+ * CVS info: $Id: zmapViewRemoteReceive.c,v 1.50 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapGFF.h>
diff --git a/src/zmapView/zmapViewRemoteSend.c b/src/zmapView/zmapViewRemoteSend.c
index 15a169e9b..7488b23f4 100755
--- a/src/zmapView/zmapViewRemoteSend.c
+++ b/src/zmapView/zmapViewRemoteSend.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Handles sending xml messages to any connected client.
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 5 10:50 2010 (edgrif)
* Created: Mon Jul 16 13:48:20 2007 (rds)
- * CVS info: $Id: zmapViewRemoteSend.c,v 1.6 2010-05-05 15:18:22 edgrif Exp $
+ * CVS info: $Id: zmapViewRemoteSend.c,v 1.7 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapView/zmapViewUtils.c b/src/zmapView/zmapViewUtils.c
index aa78d1c23..d0b584f87 100755
--- a/src/zmapView/zmapViewUtils.c
+++ b/src/zmapView/zmapViewUtils.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Utility functions for a ZMapView.
* StepLists changed to be the child of a connection by Malcolm Hinsley (mh17@sanger.ac.uk) 11 Mar 2010
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Mar 11 13:27 2010 (edgrif)
* Created: Mon Sep 20 10:29:15 2004 (edgrif)
- * CVS info: $Id: zmapViewUtils.c,v 1.22 2010-05-17 14:41:15 mh17 Exp $
+ * CVS info: $Id: zmapViewUtils.c,v 1.23 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapGFF.h>
diff --git a/src/zmapView/zmapView_P.h b/src/zmapView/zmapView_P.h
index 4f6a15a7e..89a6cdd09 100755
--- a/src/zmapView/zmapView_P.h
+++ b/src/zmapView/zmapView_P.h
@@ -19,14 +19,15 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* HISTORY:
* Last edited: Apr 7 13:48 2010 (edgrif)
* Created: Thu May 13 15:06:21 2004 (edgrif)
- * CVS info: $Id: zmapView_P.h,v 1.62 2010-06-08 08:31:25 mh17 Exp $
+ * CVS info: $Id: zmapView_P.h,v 1.63 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_VIEW_P_H
diff --git a/src/zmapWindow/items/zmapWindowAlignmentFeature.c b/src/zmapWindow/items/zmapWindowAlignmentFeature.c
index 99691fc01..d49f0abdb 100755
--- a/src/zmapWindow/items/zmapWindowAlignmentFeature.c
+++ b/src/zmapWindow/items/zmapWindowAlignmentFeature.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements a custom foocanvas item that represents
* an "alignment", i.e. an HSP.
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: May 26 12:53 2010 (edgrif)
* Created: Wed Dec 3 10:02:22 2008 (rds)
- * CVS info: $Id: zmapWindowAlignmentFeature.c,v 1.11 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowAlignmentFeature.c,v 1.12 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindowCanvasItem_I.h>
#include <zmapWindowAlignmentFeature_I.h>
diff --git a/src/zmapWindow/items/zmapWindowAlignmentFeature.h b/src/zmapWindow/items/zmapWindowAlignmentFeature.h
index 86fe1226c..b1ddecfb9 100755
--- a/src/zmapWindow/items/zmapWindowAlignmentFeature.h
+++ b/src/zmapWindow/items/zmapWindowAlignmentFeature.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 16 10:14 2010 (edgrif)
* Created: Wed Dec 3 08:44:06 2008 (rds)
- * CVS info: $Id: zmapWindowAlignmentFeature.h,v 1.5 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowAlignmentFeature.h,v 1.6 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowAlignmentFeature_I.h b/src/zmapWindow/items/zmapWindowAlignmentFeature_I.h
index f4446a32b..ed55ce599 100755
--- a/src/zmapWindow/items/zmapWindowAlignmentFeature_I.h
+++ b/src/zmapWindow/items/zmapWindowAlignmentFeature_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 15 15:50 2010 (edgrif)
* Created: Wed Dec 3 08:25:28 2008 (rds)
- * CVS info: $Id: zmapWindowAlignmentFeature_I.h,v 1.3 2010-03-04 15:11:42 mh17 Exp $
+ * CVS info: $Id: zmapWindowAlignmentFeature_I.h,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_ALIGNMENT_FEATURE_I_H
diff --git a/src/zmapWindow/items/zmapWindowAllBase.c b/src/zmapWindow/items/zmapWindowAllBase.c
index 6f7f8fbd5..7adcfb301 100644
--- a/src/zmapWindow/items/zmapWindowAllBase.c
+++ b/src/zmapWindow/items/zmapWindowAllBase.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Contains functions required by all zmap item and
* group types. These are mostly utility functions
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: May 26 13:30 2010 (edgrif)
* Created: Wed May 26 09:43:09 2010 (edgrif)
- * CVS info: $Id: zmapWindowAllBase.c,v 1.1 2010-05-26 12:46:19 edgrif Exp $
+ * CVS info: $Id: zmapWindowAllBase.c,v 1.2 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <libfoocanvas/libfoocanvas.h> /* Used to get struct sizes/types for stats. */
#include <zmapWindowFeatures_I.h>
#include <zmapWindowContainers_I.h>
diff --git a/src/zmapWindow/items/zmapWindowAllBase.h b/src/zmapWindow/items/zmapWindowAllBase.h
index 90c2fe669..dfa9988a4 100644
--- a/src/zmapWindow/items/zmapWindowAllBase.h
+++ b/src/zmapWindow/items/zmapWindowAllBase.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: There are some things common to all groups and items
* and this file contains them.
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 26 11:54 2010 (edgrif)
* Created: Wed May 12 11:45:10 2010 (edgrif)
- * CVS info: $Id: zmapWindowAllBase.h,v 1.2 2010-05-26 12:46:19 edgrif Exp $
+ * CVS info: $Id: zmapWindowAllBase.h,v 1.3 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_ALL_BASE_H
diff --git a/src/zmapWindow/items/zmapWindowAssemblyFeature.c b/src/zmapWindow/items/zmapWindowAssemblyFeature.c
index d08468bfb..1a5e94ddd 100755
--- a/src/zmapWindow/items/zmapWindowAssemblyFeature.c
+++ b/src/zmapWindow/items/zmapWindowAssemblyFeature.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 26 12:53 2010 (edgrif)
* Created: Wed Dec 3 10:02:22 2008 (rds)
- * CVS info: $Id: zmapWindowAssemblyFeature.c,v 1.6 2010-05-26 12:45:44 edgrif Exp $
+ * CVS info: $Id: zmapWindowAssemblyFeature.c,v 1.7 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindowAssemblyFeature_I.h>
enum
diff --git a/src/zmapWindow/items/zmapWindowAssemblyFeature.h b/src/zmapWindow/items/zmapWindowAssemblyFeature.h
index 1b2ffb0ba..e5e606acd 100755
--- a/src/zmapWindow/items/zmapWindowAssemblyFeature.h
+++ b/src/zmapWindow/items/zmapWindowAssemblyFeature.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 16 10:16 2010 (edgrif)
* Created: Wed Dec 3 08:44:06 2008 (rds)
- * CVS info: $Id: zmapWindowAssemblyFeature.h,v 1.5 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowAssemblyFeature.h,v 1.6 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_ASSEMBLY_FEATURE_H
diff --git a/src/zmapWindow/items/zmapWindowAssemblyFeature_I.h b/src/zmapWindow/items/zmapWindowAssemblyFeature_I.h
index caf580839..fc8f68066 100755
--- a/src/zmapWindow/items/zmapWindowAssemblyFeature_I.h
+++ b/src/zmapWindow/items/zmapWindowAssemblyFeature_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jul 1 00:30 2009 (rds)
* Created: Wed Dec 3 08:25:28 2008 (rds)
- * CVS info: $Id: zmapWindowAssemblyFeature_I.h,v 1.3 2010-03-04 15:11:45 mh17 Exp $
+ * CVS info: $Id: zmapWindowAssemblyFeature_I.h,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowBasicFeature.c b/src/zmapWindow/items/zmapWindowBasicFeature.c
index 1d1e25616..4785b90ca 100755
--- a/src/zmapWindow/items/zmapWindowBasicFeature.c
+++ b/src/zmapWindow/items/zmapWindowBasicFeature.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 26 12:54 2010 (edgrif)
* Created: Wed Dec 3 10:02:22 2008 (rds)
- * CVS info: $Id: zmapWindowBasicFeature.c,v 1.20 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowBasicFeature.c,v 1.21 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindowBasicFeature_I.h>
diff --git a/src/zmapWindow/items/zmapWindowBasicFeature.h b/src/zmapWindow/items/zmapWindowBasicFeature.h
index 3abf83260..9ad64bab2 100755
--- a/src/zmapWindow/items/zmapWindowBasicFeature.h
+++ b/src/zmapWindow/items/zmapWindowBasicFeature.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 25 12:20 2010 (edgrif)
* Created: Wed Dec 3 08:44:06 2008 (rds)
- * CVS info: $Id: zmapWindowBasicFeature.h,v 1.6 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowBasicFeature.h,v 1.7 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_BASIC_FEATURE_H
diff --git a/src/zmapWindow/items/zmapWindowBasicFeature_I.h b/src/zmapWindow/items/zmapWindowBasicFeature_I.h
index f1e64a418..3c26edd6d 100755
--- a/src/zmapWindow/items/zmapWindowBasicFeature_I.h
+++ b/src/zmapWindow/items/zmapWindowBasicFeature_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 25 13:45 2010 (edgrif)
* Created: Wed Dec 3 08:25:28 2008 (rds)
- * CVS info: $Id: zmapWindowBasicFeature_I.h,v 1.4 2010-05-26 12:47:40 edgrif Exp $
+ * CVS info: $Id: zmapWindowBasicFeature_I.h,v 1.5 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_BASIC_FEATURE_I_H
diff --git a/src/zmapWindow/items/zmapWindowCanvas.c b/src/zmapWindow/items/zmapWindowCanvas.c
index 547bc431f..f77025568 100755
--- a/src/zmapWindow/items/zmapWindowCanvas.c
+++ b/src/zmapWindow/items/zmapWindowCanvas.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Apr 26 15:35 2010 (edgrif)
* Created: Wed Apr 29 14:42:41 2009 (rds)
- * CVS info: $Id: zmapWindowCanvas.c,v 1.6 2010-04-26 14:36:11 edgrif Exp $
+ * CVS info: $Id: zmapWindowCanvas.c,v 1.7 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindowCanvas_I.h>
enum
diff --git a/src/zmapWindow/items/zmapWindowCanvas.h b/src/zmapWindow/items/zmapWindowCanvas.h
index b94362183..72e2472c4 100755
--- a/src/zmapWindow/items/zmapWindowCanvas.h
+++ b/src/zmapWindow/items/zmapWindowCanvas.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 16 10:19 2010 (edgrif)
* Created: Wed Apr 29 14:45:58 2009 (rds)
- * CVS info: $Id: zmapWindowCanvas.h,v 1.4 2010-03-04 15:11:50 mh17 Exp $
+ * CVS info: $Id: zmapWindowCanvas.h,v 1.5 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_CANVAS_H
diff --git a/src/zmapWindow/items/zmapWindowCanvasItem.c b/src/zmapWindow/items/zmapWindowCanvasItem.c
index 7fa50eff2..76c123371 100755
--- a/src/zmapWindow/items/zmapWindowCanvasItem.c
+++ b/src/zmapWindow/items/zmapWindowCanvasItem.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 26 13:13 2010 (edgrif)
* Created: Wed Dec 3 09:00:20 2008 (rds)
- * CVS info: $Id: zmapWindowCanvasItem.c,v 1.28 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowCanvasItem.c,v 1.29 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h> /* memcpy */
#include <zmapWindowCanvas.h>
#include <zmapWindowFeatures.h>
diff --git a/src/zmapWindow/items/zmapWindowCanvasItem.h b/src/zmapWindow/items/zmapWindowCanvasItem.h
index 3c12eec3a..122580b1a 100755
--- a/src/zmapWindow/items/zmapWindowCanvasItem.h
+++ b/src/zmapWindow/items/zmapWindowCanvasItem.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 15 17:45 2010 (edgrif)
* Created: Wed Dec 3 08:21:03 2008 (rds)
- * CVS info: $Id: zmapWindowCanvasItem.h,v 1.12 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowCanvasItem.h,v 1.13 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_CANVAS_ITEM_H
diff --git a/src/zmapWindow/items/zmapWindowCanvasItem_I.h b/src/zmapWindow/items/zmapWindowCanvasItem_I.h
index 5db6a67ad..b15a69f16 100755
--- a/src/zmapWindow/items/zmapWindowCanvasItem_I.h
+++ b/src/zmapWindow/items/zmapWindowCanvasItem_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Internals of the basic zmap canvas item class, all
* other item classes include this class.
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 26 10:29 2010 (edgrif)
* Created: Wed Dec 3 08:38:10 2008 (rds)
- * CVS info: $Id: zmapWindowCanvasItem_I.h,v 1.10 2010-05-26 12:49:21 edgrif Exp $
+ * CVS info: $Id: zmapWindowCanvasItem_I.h,v 1.11 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowCanvas_I.h b/src/zmapWindow/items/zmapWindowCanvas_I.h
index 869abfecb..fddf54f18 100755
--- a/src/zmapWindow/items/zmapWindowCanvas_I.h
+++ b/src/zmapWindow/items/zmapWindowCanvas_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jul 9 18:24 2009 (rds)
* Created: Wed Apr 29 14:45:15 2009 (rds)
- * CVS info: $Id: zmapWindowCanvas_I.h,v 1.4 2010-03-04 15:11:54 mh17 Exp $
+ * CVS info: $Id: zmapWindowCanvas_I.h,v 1.5 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerAlignment.c b/src/zmapWindow/items/zmapWindowContainerAlignment.c
index 9c70e77c8..32e43b3cf 100755
--- a/src/zmapWindow/items/zmapWindowContainerAlignment.c
+++ b/src/zmapWindow/items/zmapWindowContainerAlignment.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 11 16:13 2010 (edgrif)
* Created: Mon Jul 30 13:09:33 2007 (rds)
- * CVS info: $Id: zmapWindowContainerAlignment.c,v 1.5 2010-05-24 14:11:31 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerAlignment.c,v 1.6 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindowContainerAlignment_I.h>
#include <zmapWindowContainerUtils.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerAlignment.h b/src/zmapWindow/items/zmapWindowContainerAlignment.h
index 42821be22..c2ca49dd7 100755
--- a/src/zmapWindow/items/zmapWindowContainerAlignment.h
+++ b/src/zmapWindow/items/zmapWindowContainerAlignment.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 10 14:53 2009 (rds)
* Created: Wed Dec 3 08:21:03 2008 (rds)
- * CVS info: $Id: zmapWindowContainerAlignment.h,v 1.4 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerAlignment.h,v 1.5 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerAlignment_I.h b/src/zmapWindow/items/zmapWindowContainerAlignment_I.h
index 1fbc7b863..6ecd6d020 100755
--- a/src/zmapWindow/items/zmapWindowContainerAlignment_I.h
+++ b/src/zmapWindow/items/zmapWindowContainerAlignment_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 20 10:04 2010 (edgrif)
* Created: Fri Feb 6 11:49:03 2009 (rds)
- * CVS info: $Id: zmapWindowContainerAlignment_I.h,v 1.3 2010-05-24 14:12:05 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerAlignment_I.h,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerBlock.c b/src/zmapWindow/items/zmapWindowContainerBlock.c
index 0ea91494e..8828f517d 100755
--- a/src/zmapWindow/items/zmapWindowContainerBlock.c
+++ b/src/zmapWindow/items/zmapWindowContainerBlock.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 20 09:32 2010 (edgrif)
* Created: Mon Jul 30 13:09:33 2007 (rds)
- * CVS info: $Id: zmapWindowContainerBlock.c,v 1.11 2010-05-24 14:13:13 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerBlock.c,v 1.12 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapSeqBitmap.h>
#include <zmapWindowContainerBlock_I.h>
#include <zmapWindowContainerFeatureSet_I.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerBlock.h b/src/zmapWindow/items/zmapWindowContainerBlock.h
index 3ac4b0a02..6faae7115 100755
--- a/src/zmapWindow/items/zmapWindowContainerBlock.h
+++ b/src/zmapWindow/items/zmapWindowContainerBlock.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jan 21 22:01 2010 (roy)
* Created: Wed Dec 3 08:21:03 2008 (rds)
- * CVS info: $Id: zmapWindowContainerBlock.h,v 1.6 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerBlock.h,v 1.7 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerBlock_I.h b/src/zmapWindow/items/zmapWindowContainerBlock_I.h
index f60fc40dd..504188b61 100755
--- a/src/zmapWindow/items/zmapWindowContainerBlock_I.h
+++ b/src/zmapWindow/items/zmapWindowContainerBlock_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 20 10:05 2010 (edgrif)
* Created: Fri Feb 6 11:49:03 2009 (rds)
- * CVS info: $Id: zmapWindowContainerBlock_I.h,v 1.5 2010-05-24 14:13:15 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerBlock_I.h,v 1.6 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerChildren.c b/src/zmapWindow/items/zmapWindowContainerChildren.c
index d2919c2d1..7ea5aeef4 100755
--- a/src/zmapWindow/items/zmapWindowContainerChildren.c
+++ b/src/zmapWindow/items/zmapWindowContainerChildren.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 24 15:17 2010 (edgrif)
* Created: Mon Apr 27 18:01:23 2009 (rds)
- * CVS info: $Id: zmapWindowContainerChildren.c,v 1.5 2010-05-24 14:18:51 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerChildren.c,v 1.6 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapBase.h>
#include <zmapWindowContainerGroup_I.h>
#include <zmapWindowContainerChildren_I.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerChildren.h b/src/zmapWindow/items/zmapWindowContainerChildren.h
index e538e9c45..cbea7d5c4 100755
--- a/src/zmapWindow/items/zmapWindowContainerChildren.h
+++ b/src/zmapWindow/items/zmapWindowContainerChildren.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 4 08:32 2009 (rds)
* Created: Wed Dec 3 08:21:03 2008 (rds)
- * CVS info: $Id: zmapWindowContainerChildren.h,v 1.5 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerChildren.h,v 1.6 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerChildren_I.h b/src/zmapWindow/items/zmapWindowContainerChildren_I.h
index 81132a4d1..733b5d513 100755
--- a/src/zmapWindow/items/zmapWindowContainerChildren_I.h
+++ b/src/zmapWindow/items/zmapWindowContainerChildren_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 20 10:05 2010 (edgrif)
* Created: Wed Dec 3 08:38:10 2008 (rds)
- * CVS info: $Id: zmapWindowContainerChildren_I.h,v 1.3 2010-05-24 14:18:05 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerChildren_I.h,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerContext.c b/src/zmapWindow/items/zmapWindowContainerContext.c
index ebe5300df..312da6c36 100755
--- a/src/zmapWindow/items/zmapWindowContainerContext.c
+++ b/src/zmapWindow/items/zmapWindowContainerContext.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 20 10:34 2010 (edgrif)
* Created: Mon Jul 30 13:09:33 2007 (rds)
- * CVS info: $Id: zmapWindowContainerContext.c,v 1.7 2010-05-24 14:14:04 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerContext.c,v 1.8 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapBase.h>
#include <zmapWindowCanvas.h>
#include <zmapWindowContainerGroup_I.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerContext.h b/src/zmapWindow/items/zmapWindowContainerContext.h
index 99bfbadba..a3441dfe4 100755
--- a/src/zmapWindow/items/zmapWindowContainerContext.h
+++ b/src/zmapWindow/items/zmapWindowContainerContext.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 20 13:10 2009 (rds)
* Created: Wed Dec 3 08:21:03 2008 (rds)
- * CVS info: $Id: zmapWindowContainerContext.h,v 1.3 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerContext.h,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerContext_I.h b/src/zmapWindow/items/zmapWindowContainerContext_I.h
index b4649ed94..52435a88f 100755
--- a/src/zmapWindow/items/zmapWindowContainerContext_I.h
+++ b/src/zmapWindow/items/zmapWindowContainerContext_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 20 10:05 2010 (edgrif)
* Created: Fri Feb 6 11:49:03 2009 (rds)
- * CVS info: $Id: zmapWindowContainerContext_I.h,v 1.3 2010-05-24 14:14:04 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerContext_I.h,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerFeatureSet.c b/src/zmapWindow/items/zmapWindowContainerFeatureSet.c
index 78b23299e..5bfcde097 100755
--- a/src/zmapWindow/items/zmapWindowContainerFeatureSet.c
+++ b/src/zmapWindow/items/zmapWindowContainerFeatureSet.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,9 +30,16 @@
* HISTORY:
* Last edited: May 21 17:06 2010 (edgrif)
* Created: Mon Jul 30 13:09:33 2007 (rds)
- * CVS info: $Id: zmapWindowContainerFeatureSet.c,v 1.30 2010-06-10 10:25:50 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerFeatureSet.c,v 1.31 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+
+#include <ZMap/zmap.h>
+
+
+
+
+
#include <string.h> /* memset */
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerFeatureSet.h b/src/zmapWindow/items/zmapWindowContainerFeatureSet.h
index ab50fe7ba..6fb7f7e2d 100755
--- a/src/zmapWindow/items/zmapWindowContainerFeatureSet.h
+++ b/src/zmapWindow/items/zmapWindowContainerFeatureSet.h
@@ -20,15 +20,16 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Header for class representing a column in zmap.
*
* HISTORY:
* Last edited: May 24 15:40 2010 (edgrif)
* Created: Wed Dec 3 08:21:03 2008 (rds)
- * CVS info: $Id: zmapWindowContainerFeatureSet.h,v 1.13 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerFeatureSet.h,v 1.14 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerFeatureSetUtils.c b/src/zmapWindow/items/zmapWindowContainerFeatureSetUtils.c
index 827a08e14..c258239b8 100755
--- a/src/zmapWindow/items/zmapWindowContainerFeatureSetUtils.c
+++ b/src/zmapWindow/items/zmapWindowContainerFeatureSetUtils.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions to handle various functions of column sets,
* e.g. adding colinear lines to alignments.
@@ -30,9 +31,16 @@
* HISTORY:
* Last edited: May 24 12:05 2010 (edgrif)
* Created: Wed Dec 3 10:02:22 2008 (rds)
- * CVS info: $Id: zmapWindowContainerFeatureSetUtils.c,v 1.3 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerFeatureSetUtils.c,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+
+#include <ZMap/zmap.h>
+
+
+
+
+
#include <math.h>
#include <glib.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerFeatureSet_I.h b/src/zmapWindow/items/zmapWindowContainerFeatureSet_I.h
index bffd1f387..f96bf8262 100755
--- a/src/zmapWindow/items/zmapWindowContainerFeatureSet_I.h
+++ b/src/zmapWindow/items/zmapWindowContainerFeatureSet_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Internal header for class that represents a column
* in zmap.
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 24 15:41 2010 (edgrif)
* Created: Fri Feb 6 11:49:03 2009 (rds)
- * CVS info: $Id: zmapWindowContainerFeatureSet_I.h,v 1.11 2010-05-25 14:17:01 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerFeatureSet_I.h,v 1.12 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef __ZMAP_WINDOW_CONTAINER_FEATURE_SET_I_H__
diff --git a/src/zmapWindow/items/zmapWindowContainerGroup.c b/src/zmapWindow/items/zmapWindowContainerGroup.c
index 52b6c888d..8e53c163c 100755
--- a/src/zmapWindow/items/zmapWindowContainerGroup.c
+++ b/src/zmapWindow/items/zmapWindowContainerGroup.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 24 15:23 2010 (edgrif)
* Created: Wed Dec 3 10:02:22 2008 (rds)
- * CVS info: $Id: zmapWindowContainerGroup.c,v 1.14 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerGroup.c,v 1.15 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <ZMap/zmapBase.h> /* for ZMAP_PARAM_STATIC_RW */
#include <zmapWindowCanvas.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerGroup.h b/src/zmapWindow/items/zmapWindowContainerGroup.h
index a9b39e048..229b62ec1 100755
--- a/src/zmapWindow/items/zmapWindowContainerGroup.h
+++ b/src/zmapWindow/items/zmapWindowContainerGroup.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 20 11:13 2010 (edgrif)
* Created: Wed Dec 3 08:21:03 2008 (rds)
- * CVS info: $Id: zmapWindowContainerGroup.h,v 1.10 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerGroup.h,v 1.11 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_CONTAINER_GROUP_H
diff --git a/src/zmapWindow/items/zmapWindowContainerGroup_I.h b/src/zmapWindow/items/zmapWindowContainerGroup_I.h
index 1a8aa4869..3bb86941b 100755
--- a/src/zmapWindow/items/zmapWindowContainerGroup_I.h
+++ b/src/zmapWindow/items/zmapWindowContainerGroup_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 20 10:02 2010 (edgrif)
* Created: Wed Dec 3 08:38:10 2008 (rds)
- * CVS info: $Id: zmapWindowContainerGroup_I.h,v 1.8 2010-05-24 14:25:10 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerGroup_I.h,v 1.9 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_CONTAINER_GROUP_I_H
diff --git a/src/zmapWindow/items/zmapWindowContainerStrand.c b/src/zmapWindow/items/zmapWindowContainerStrand.c
index 0b46f7906..b7dd746ad 100755
--- a/src/zmapWindow/items/zmapWindowContainerStrand.c
+++ b/src/zmapWindow/items/zmapWindowContainerStrand.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 10 14:18 2009 (rds)
* Created: Wed May 20 10:59:40 2009 (rds)
- * CVS info: $Id: zmapWindowContainerStrand.c,v 1.5 2010-03-04 15:12:13 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerStrand.c,v 1.6 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindowContainerStrand_I.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerStrand.h b/src/zmapWindow/items/zmapWindowContainerStrand.h
index e1e98e0aa..1eece21a0 100755
--- a/src/zmapWindow/items/zmapWindowContainerStrand.h
+++ b/src/zmapWindow/items/zmapWindowContainerStrand.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 4 09:42 2009 (rds)
* Created: Wed Dec 3 08:21:03 2008 (rds)
- * CVS info: $Id: zmapWindowContainerStrand.h,v 1.4 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerStrand.h,v 1.5 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerStrand_I.h b/src/zmapWindow/items/zmapWindowContainerStrand_I.h
index 8f1b3a6ee..f53ed8153 100755
--- a/src/zmapWindow/items/zmapWindowContainerStrand_I.h
+++ b/src/zmapWindow/items/zmapWindowContainerStrand_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 4 09:40 2009 (rds)
* Created: Wed Dec 3 08:38:10 2008 (rds)
- * CVS info: $Id: zmapWindowContainerStrand_I.h,v 1.3 2010-03-04 15:12:15 mh17 Exp $
+ * CVS info: $Id: zmapWindowContainerStrand_I.h,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef __ZMAP_WINDOW_CONTAINER_STRAND_I_H__
diff --git a/src/zmapWindow/items/zmapWindowContainerUtils.c b/src/zmapWindow/items/zmapWindowContainerUtils.c
index 01cfe9571..15dd83bbe 100755
--- a/src/zmapWindow/items/zmapWindowContainerUtils.c
+++ b/src/zmapWindow/items/zmapWindowContainerUtils.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Utility functions for "container" zmap canvas items,
* these include feature set, alignment, block etc.
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: May 24 15:27 2010 (edgrif)
* Created: Tue Apr 28 16:10:46 2009 (rds)
- * CVS info: $Id: zmapWindowContainerUtils.c,v 1.17 2010-05-24 14:28:27 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerUtils.c,v 1.18 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtilsFoo.h>
#include <zmapWindowCanvas.h>
#include <zmapWindowCanvasItem.h>
diff --git a/src/zmapWindow/items/zmapWindowContainerUtils.h b/src/zmapWindow/items/zmapWindowContainerUtils.h
index 1ad72e41d..23b581a7a 100755
--- a/src/zmapWindow/items/zmapWindowContainerUtils.h
+++ b/src/zmapWindow/items/zmapWindowContainerUtils.h
@@ -20,15 +20,16 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Utility functions for containers (context, align, block etc).
*
* HISTORY:
* Last edited: May 20 10:24 2010 (edgrif)
* Created: Thu Apr 30 14:40:12 2009 (rds)
- * CVS info: $Id: zmapWindowContainerUtils.h,v 1.8 2010-05-24 14:29:22 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerUtils.h,v 1.9 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowContainerUtils_P.h b/src/zmapWindow/items/zmapWindowContainerUtils_P.h
index dbcf9104e..d86b633ab 100755
--- a/src/zmapWindow/items/zmapWindowContainerUtils_P.h
+++ b/src/zmapWindow/items/zmapWindowContainerUtils_P.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 20 10:03 2010 (edgrif)
* Created: Wed May 20 08:33:22 2009 (rds)
- * CVS info: $Id: zmapWindowContainerUtils_P.h,v 1.8 2010-05-24 14:29:55 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerUtils_P.h,v 1.9 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_CONTAINER_UTILS_P_H
diff --git a/src/zmapWindow/items/zmapWindowContainers.h b/src/zmapWindow/items/zmapWindowContainers.h
index ba2299ced..40d6176e3 100755
--- a/src/zmapWindow/items/zmapWindowContainers.h
+++ b/src/zmapWindow/items/zmapWindowContainers.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 26 13:05 2010 (edgrif)
* Created: Thu Jun 4 08:39:55 2009 (rds)
- * CVS info: $Id: zmapWindowContainers.h,v 1.3 2010-05-26 12:48:41 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainers.h,v 1.4 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef __ZMAP_WINDOW_CONTAINERS_H__
diff --git a/src/zmapWindow/items/zmapWindowContainers_I.h b/src/zmapWindow/items/zmapWindowContainers_I.h
index 04d7a8ec6..9498f23a5 100644
--- a/src/zmapWindow/items/zmapWindowContainers_I.h
+++ b/src/zmapWindow/items/zmapWindowContainers_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 26 13:13 2010 (edgrif)
* Created: Wed May 26 13:04:15 2010 (edgrif)
- * CVS info: $Id: zmapWindowContainers_I.h,v 1.1 2010-05-26 12:48:41 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainers_I.h,v 1.2 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef __ZMAP_WINDOW_CONTAINERS_I_H__
diff --git a/src/zmapWindow/items/zmapWindowFeatures.h b/src/zmapWindow/items/zmapWindowFeatures.h
index f22f0a311..3d945fcba 100644
--- a/src/zmapWindow/items/zmapWindowFeatures.h
+++ b/src/zmapWindow/items/zmapWindowFeatures.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Include this header to get access to all public
* zmapWindowNNNN.h feature headers. This header includes
@@ -31,7 +32,7 @@
* HISTORY:
* Last edited: May 26 13:13 2010 (edgrif)
* Created: Mon Feb 15 11:40:27 2010 (edgrif)
- * CVS info: $Id: zmapWindowFeatures.h,v 1.4 2010-05-26 12:48:40 edgrif Exp $
+ * CVS info: $Id: zmapWindowFeatures.h,v 1.5 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_FEATURES_H
diff --git a/src/zmapWindow/items/zmapWindowFeatures_I.h b/src/zmapWindow/items/zmapWindowFeatures_I.h
index d86e301e7..e2c61dea2 100644
--- a/src/zmapWindow/items/zmapWindowFeatures_I.h
+++ b/src/zmapWindow/items/zmapWindowFeatures_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Convenience header to include all feature private
* headers (which themselves include all the public
@@ -30,7 +31,7 @@
* HISTORY:
* Last edited: May 26 13:11 2010 (edgrif)
* Created: Wed May 26 13:00:34 2010 (edgrif)
- * CVS info: $Id: zmapWindowFeatures_I.h,v 1.1 2010-05-26 12:48:41 edgrif Exp $
+ * CVS info: $Id: zmapWindowFeatures_I.h,v 1.2 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_FEATURES_I_H
diff --git a/src/zmapWindow/items/zmapWindowGlyphItem.c b/src/zmapWindow/items/zmapWindowGlyphItem.c
index aa1962d86..d78fd7799 100755
--- a/src/zmapWindow/items/zmapWindowGlyphItem.c
+++ b/src/zmapWindow/items/zmapWindowGlyphItem.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 3 09:51 2009 (rds)
* Created: Fri Jan 16 11:20:07 2009 (rds)
- * CVS info: $Id: zmapWindowGlyphItem.c,v 1.12 2010-05-20 11:42:11 mh17 Exp $
+ * CVS info: $Id: zmapWindowGlyphItem.c,v 1.13 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <string.h>
@@ -142,7 +150,7 @@ ZMapWindowGlyphItem zMapWindowGlyphItemCreate(FooCanvasGroup *parent,
double x_coord,double y_coord,double score,gboolean rev_strand)
{
ZMapWindowGlyphItem glyph = NULL;
- ZMapStyleGlyphShape shape;
+ ZMapStyleGlyphShapeStruct const *shape;
GdkColor *draw = NULL, *fill = NULL, *border = NULL;
double width = 1.0,height = 1.0; // these are ratios not pixels
ZMapStyleScoreMode score_mode = ZMAPSCORE_INVALID;
diff --git a/src/zmapWindow/items/zmapWindowGlyphItem.h b/src/zmapWindow/items/zmapWindowGlyphItem.h
index a43e076e8..44c2b73a2 100755
--- a/src/zmapWindow/items/zmapWindowGlyphItem.h
+++ b/src/zmapWindow/items/zmapWindowGlyphItem.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Apr 6 14:45 2009 (rds)
* Created: Fri Jan 16 14:01:12 2009 (rds)
- * CVS info: $Id: zmapWindowGlyphItem.h,v 1.7 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowGlyphItem.h,v 1.8 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowGlyphItem_I.h b/src/zmapWindow/items/zmapWindowGlyphItem_I.h
index 583cb9931..268b3556b 100755
--- a/src/zmapWindow/items/zmapWindowGlyphItem_I.h
+++ b/src/zmapWindow/items/zmapWindowGlyphItem_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Apr 6 14:44 2009 (rds)
* Created: Fri Jan 16 13:56:52 2009 (rds)
- * CVS info: $Id: zmapWindowGlyphItem_I.h,v 1.4 2010-04-15 11:19:04 mh17 Exp $
+ * CVS info: $Id: zmapWindowGlyphItem_I.h,v 1.5 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowLongItem.c b/src/zmapWindow/items/zmapWindowLongItem.c
index 2a8b58d27..c218e7c18 100755
--- a/src/zmapWindow/items/zmapWindowLongItem.c
+++ b/src/zmapWindow/items/zmapWindowLongItem.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements code to clip items that would exceed the
* X Windows max window limit if they were drawn. Code
@@ -32,10 +33,17 @@
* HISTORY:
* Last edited: May 24 16:27 2010 (edgrif)
* Created: Fri Jan 16 11:20:07 2009 (rds)
- * CVS info: $Id: zmapWindowLongItem.c,v 1.6 2010-05-24 15:30:09 edgrif Exp $
+ * CVS info: $Id: zmapWindowLongItem.c,v 1.7 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <string.h>
diff --git a/src/zmapWindow/items/zmapWindowLongItem.h b/src/zmapWindow/items/zmapWindowLongItem.h
index cc2ddabc0..83c934c36 100755
--- a/src/zmapWindow/items/zmapWindowLongItem.h
+++ b/src/zmapWindow/items/zmapWindowLongItem.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jul 9 10:07 2009 (rds)
* Created: Fri Jan 16 14:01:12 2009 (rds)
- * CVS info: $Id: zmapWindowLongItem.h,v 1.4 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowLongItem.h,v 1.5 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowLongItem_I.h b/src/zmapWindow/items/zmapWindowLongItem_I.h
index 9c3ccc216..48a33babc 100755
--- a/src/zmapWindow/items/zmapWindowLongItem_I.h
+++ b/src/zmapWindow/items/zmapWindowLongItem_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jul 9 11:00 2009 (rds)
* Created: Fri Jan 16 13:56:52 2009 (rds)
- * CVS info: $Id: zmapWindowLongItem_I.h,v 1.2 2010-03-04 15:12:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowLongItem_I.h,v 1.3 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowLongItems_P.h b/src/zmapWindow/items/zmapWindowLongItems_P.h
index bbcf3c887..49463b0d7 100755
--- a/src/zmapWindow/items/zmapWindowLongItems_P.h
+++ b/src/zmapWindow/items/zmapWindowLongItems_P.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 14 08:43 2009 (rds)
* Created: Tue May 12 15:54:30 2009 (rds)
- * CVS info: $Id: zmapWindowLongItems_P.h,v 1.2 2010-03-04 15:12:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowLongItems_P.h,v 1.3 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowSequenceFeature.c b/src/zmapWindow/items/zmapWindowSequenceFeature.c
index 1af02384c..20136fedb 100755
--- a/src/zmapWindow/items/zmapWindowSequenceFeature.c
+++ b/src/zmapWindow/items/zmapWindowSequenceFeature.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Feb 16 10:07 2010 (edgrif)
* Created: Fri Jun 12 10:01:17 2009 (rds)
- * CVS info: $Id: zmapWindowSequenceFeature.c,v 1.11 2010-03-29 15:32:40 mh17 Exp $
+ * CVS info: $Id: zmapWindowSequenceFeature.c,v 1.12 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapPeptide.h>
#include <zmapWindowSequenceFeature_I.h>
#include <zmapWindowSequenceFeatureCMarshal.h>
diff --git a/src/zmapWindow/items/zmapWindowSequenceFeature.h b/src/zmapWindow/items/zmapWindowSequenceFeature.h
index e17cc32d2..f3e9a28ff 100755
--- a/src/zmapWindow/items/zmapWindowSequenceFeature.h
+++ b/src/zmapWindow/items/zmapWindowSequenceFeature.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 16 09:58 2010 (edgrif)
* Created: Wed Dec 3 08:44:06 2008 (rds)
- * CVS info: $Id: zmapWindowSequenceFeature.h,v 1.8 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowSequenceFeature.h,v 1.9 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowSequenceFeature_I.h b/src/zmapWindow/items/zmapWindowSequenceFeature_I.h
index 611e58abb..d1df2b45c 100755
--- a/src/zmapWindow/items/zmapWindowSequenceFeature_I.h
+++ b/src/zmapWindow/items/zmapWindowSequenceFeature_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 16 09:58 2010 (edgrif)
* Created: Wed Dec 3 08:25:28 2008 (rds)
- * CVS info: $Id: zmapWindowSequenceFeature_I.h,v 1.5 2010-03-04 15:12:30 mh17 Exp $
+ * CVS info: $Id: zmapWindowSequenceFeature_I.h,v 1.6 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowTextFeature.c b/src/zmapWindow/items/zmapWindowTextFeature.c
index a570b7090..0918c8395 100755
--- a/src/zmapWindow/items/zmapWindowTextFeature.c
+++ b/src/zmapWindow/items/zmapWindowTextFeature.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,9 +30,16 @@
* HISTORY:
* Last edited: Oct 21 16:13 2009 (edgrif)
* Created: Tue Jan 13 13:41:57 2009 (rds)
- * CVS info: $Id: zmapWindowTextFeature.c,v 1.10 2010-03-29 15:32:40 mh17 Exp $
+ * CVS info: $Id: zmapWindowTextFeature.c,v 1.11 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+
+#include <ZMap/zmap.h>
+
+
+
+
+
#include <math.h> /* pow(), sqrt() */
#include <zmapWindowTextFeature_I.h>
diff --git a/src/zmapWindow/items/zmapWindowTextFeature.h b/src/zmapWindow/items/zmapWindowTextFeature.h
index 6ffe194ac..f8063b298 100755
--- a/src/zmapWindow/items/zmapWindowTextFeature.h
+++ b/src/zmapWindow/items/zmapWindowTextFeature.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jan 13 13:40 2009 (rds)
* Created: Wed Dec 3 08:44:06 2008 (rds)
- * CVS info: $Id: zmapWindowTextFeature.h,v 1.3 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowTextFeature.h,v 1.4 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowTextFeature_I.h b/src/zmapWindow/items/zmapWindowTextFeature_I.h
index c26c03a84..4efca36dc 100755
--- a/src/zmapWindow/items/zmapWindowTextFeature_I.h
+++ b/src/zmapWindow/items/zmapWindowTextFeature_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 15 15:53 2010 (edgrif)
* Created: Wed Dec 3 08:25:28 2008 (rds)
- * CVS info: $Id: zmapWindowTextFeature_I.h,v 1.3 2010-03-04 15:12:33 mh17 Exp $
+ * CVS info: $Id: zmapWindowTextFeature_I.h,v 1.4 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_TEXT_FEATURE_I_H
diff --git a/src/zmapWindow/items/zmapWindowTextItem.c b/src/zmapWindow/items/zmapWindowTextItem.c
index 5795f328e..5e3c2f494 100755
--- a/src/zmapWindow/items/zmapWindowTextItem.c
+++ b/src/zmapWindow/items/zmapWindowTextItem.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements a zmap foocanvas text item that displays
* dna or peptide sequence including highlighting, selecting
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Apr 20 09:52 2010 (edgrif)
* Created: Fri Jan 16 11:20:07 2009 (rds)
- * CVS info: $Id: zmapWindowTextItem.c,v 1.10 2010-04-20 08:53:27 edgrif Exp $
+ * CVS info: $Id: zmapWindowTextItem.c,v 1.11 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <config.h>
#include <math.h>
#include <string.h>
diff --git a/src/zmapWindow/items/zmapWindowTextItem.h b/src/zmapWindow/items/zmapWindowTextItem.h
index ad096dc73..bdd7952b5 100755
--- a/src/zmapWindow/items/zmapWindowTextItem.h
+++ b/src/zmapWindow/items/zmapWindowTextItem.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 18 15:01 2009 (rds)
* Created: Fri Jan 16 14:01:12 2009 (rds)
- * CVS info: $Id: zmapWindowTextItem.h,v 1.4 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowTextItem.h,v 1.5 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/items/zmapWindowTextItem_I.h b/src/zmapWindow/items/zmapWindowTextItem_I.h
index 4381fea80..30993aff9 100755
--- a/src/zmapWindow/items/zmapWindowTextItem_I.h
+++ b/src/zmapWindow/items/zmapWindowTextItem_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Internal data structures of zmap text item for foocanvas
* to implement dna/peptide sequence display.
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Apr 19 16:23 2010 (edgrif)
* Created: Fri Jan 16 13:56:52 2009 (rds)
- * CVS info: $Id: zmapWindowTextItem_I.h,v 1.7 2010-04-20 08:46:54 edgrif Exp $
+ * CVS info: $Id: zmapWindowTextItem_I.h,v 1.8 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_TEXT_ITEM_I_H
diff --git a/src/zmapWindow/items/zmapWindowTranscriptFeature.c b/src/zmapWindow/items/zmapWindowTranscriptFeature.c
index 652ba78ad..8942dc5ac 100755
--- a/src/zmapWindow/items/zmapWindowTranscriptFeature.c
+++ b/src/zmapWindow/items/zmapWindowTranscriptFeature.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 26 12:58 2010 (edgrif)
* Created: Wed Dec 3 10:02:22 2008 (rds)
- * CVS info: $Id: zmapWindowTranscriptFeature.c,v 1.8 2010-05-26 12:45:44 edgrif Exp $
+ * CVS info: $Id: zmapWindowTranscriptFeature.c,v 1.9 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindowTranscriptFeature_I.h>
enum
diff --git a/src/zmapWindow/items/zmapWindowTranscriptFeature.h b/src/zmapWindow/items/zmapWindowTranscriptFeature.h
index 18c1e132a..d9d1fb61c 100755
--- a/src/zmapWindow/items/zmapWindowTranscriptFeature.h
+++ b/src/zmapWindow/items/zmapWindowTranscriptFeature.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Feb 16 10:01 2010 (edgrif)
* Created: Wed Dec 3 08:44:06 2008 (rds)
- * CVS info: $Id: zmapWindowTranscriptFeature.h,v 1.4 2010-06-08 08:31:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowTranscriptFeature.h,v 1.5 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_TRANSCRIPT_FEATURE_H
diff --git a/src/zmapWindow/items/zmapWindowTranscriptFeature_I.h b/src/zmapWindow/items/zmapWindowTranscriptFeature_I.h
index 207f5edbd..38cbcef37 100755
--- a/src/zmapWindow/items/zmapWindowTranscriptFeature_I.h
+++ b/src/zmapWindow/items/zmapWindowTranscriptFeature_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 11 15:48 2010 (edgrif)
* Created: Wed Dec 3 08:25:28 2008 (rds)
- * CVS info: $Id: zmapWindowTranscriptFeature_I.h,v 1.4 2010-05-24 14:15:33 edgrif Exp $
+ * CVS info: $Id: zmapWindowTranscriptFeature_I.h,v 1.5 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_TRANSCRIPT_FEATURE_I_H
diff --git a/src/zmapWindow/zmapWindow.c b/src/zmapWindow/zmapWindow.c
index 77010b37d..897ce4fc3 100755
--- a/src/zmapWindow/zmapWindow.c
+++ b/src/zmapWindow/zmapWindow.c
@@ -18,8 +18,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Provides interface functions for controlling a data
* display window.
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jun 11 16:31 2010 (edgrif)
* Created: Thu Jul 24 14:36:27 2003 (edgrif)
- * CVS info: $Id: zmapWindow.c,v 1.326 2010-06-11 16:06:36 edgrif Exp $
+ * CVS info: $Id: zmapWindow.c,v 1.327 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <string.h>
#include <unistd.h>
diff --git a/src/zmapWindow/zmapWindowColBump.c b/src/zmapWindow/zmapWindowColBump.c
index 73248eff0..de04df532 100755
--- a/src/zmapWindow/zmapWindowColBump.c
+++ b/src/zmapWindow/zmapWindowColBump.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Column bumping functions.
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 24 16:01 2010 (edgrif)
* Created: Tue Sep 4 10:52:09 2007 (edgrif)
- * CVS info: $Id: zmapWindowColBump.c,v 1.75 2010-06-08 08:31:25 mh17 Exp $
+ * CVS info: $Id: zmapWindowColBump.c,v 1.76 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapGLibUtils.h>
diff --git a/src/zmapWindow/zmapWindowColConfig.c b/src/zmapWindow/zmapWindowColConfig.c
index 0706c66b6..4c722e57d 100755
--- a/src/zmapWindow/zmapWindowColConfig.c
+++ b/src/zmapWindow/zmapWindowColConfig.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions to implement column configuration.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jan 19 18:35 2010 (edgrif)
* Created: Thu Mar 2 09:07:44 2006 (edgrif)
- * CVS info: $Id: zmapWindowColConfig.c,v 1.38 2010-03-04 15:12:43 mh17 Exp $
+ * CVS info: $Id: zmapWindowColConfig.c,v 1.39 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <zmapWindow_P.h>
diff --git a/src/zmapWindow/zmapWindowColOrder.c b/src/zmapWindow/zmapWindowColOrder.c
index 19b43fcf3..c06a338bc 100755
--- a/src/zmapWindow/zmapWindowColOrder.c
+++ b/src/zmapWindow/zmapWindowColOrder.c
@@ -21,8 +21,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Jun 12 09:06 2009 (rds)
* Created: Tue Dec 5 14:48:45 2006 (rds)
- * CVS info: $Id: zmapWindowColOrder.c,v 1.17 2010-05-19 13:15:31 mh17 Exp $
+ * CVS info: $Id: zmapWindowColOrder.c,v 1.18 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapGLibUtils.h>
#include <zmapWindow_P.h>
diff --git a/src/zmapWindow/zmapWindowDNA.c b/src/zmapWindow/zmapWindowDNA.c
index bcaba172d..c16cc3339 100755
--- a/src/zmapWindow/zmapWindowDNA.c
+++ b/src/zmapWindow/zmapWindowDNA.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: dialog for searching for dna strings.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jan 22 11:15 2010 (edgrif)
* Created: Fri Oct 6 16:00:11 2006 (edgrif)
- * CVS info: $Id: zmapWindowDNA.c,v 1.25 2010-03-04 15:12:45 mh17 Exp $
+ * CVS info: $Id: zmapWindowDNA.c,v 1.26 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapSequence.h>
diff --git a/src/zmapWindow/zmapWindowDNAChoose.c b/src/zmapWindow/zmapWindowDNAChoose.c
index 76bc49ea4..150fd0893 100755
--- a/src/zmapWindow/zmapWindowDNAChoose.c
+++ b/src/zmapWindow/zmapWindowDNAChoose.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Shows a dialog window allowing user to choose a section
* of DNA to export. Initially the DNA section is that
@@ -33,10 +34,17 @@
* HISTORY:
* Last edited: Jun 12 09:26 2009 (rds)
* Created: Fri Nov 10 09:50:48 2006 (edgrif)
- * CVS info: $Id: zmapWindowDNAChoose.c,v 1.11 2010-03-04 15:12:46 mh17 Exp $
+ * CVS info: $Id: zmapWindowDNAChoose.c,v 1.12 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapWindow/zmapWindowDNAList.c b/src/zmapWindow/zmapWindowDNAList.c
index d947e8bc0..7e2b5a1bd 100755
--- a/src/zmapWindow/zmapWindowDNAList.c
+++ b/src/zmapWindow/zmapWindowDNAList.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Shows a list of dna locations that can be selected
* causing the zmapwindow to scroll to that location.
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 16 15:19 2008 (rds)
* Created: Mon Oct 9 15:21:36 2006 (edgrif)
- * CVS info: $Id: zmapWindowDNAList.c,v 1.14 2010-03-15 11:00:39 mh17 Exp $
+ * CVS info: $Id: zmapWindowDNAList.c,v 1.15 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
#include <ZMap/zmapBase.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapWindow/zmapWindowDNAList.h b/src/zmapWindow/zmapWindowDNAList.h
index 96459d330..fa9309919 100755
--- a/src/zmapWindow/zmapWindowDNAList.h
+++ b/src/zmapWindow/zmapWindowDNAList.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 16 15:11 2008 (rds)
* Created: Thu May 22 10:45:05 2008 (rds)
- * CVS info: $Id: zmapWindowDNAList.h,v 1.4 2010-03-04 15:12:48 mh17 Exp $
+ * CVS info: $Id: zmapWindowDNAList.h,v 1.5 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowDNAList_I.h b/src/zmapWindow/zmapWindowDNAList_I.h
index ed2e83548..ca0732586 100755
--- a/src/zmapWindow/zmapWindowDNAList_I.h
+++ b/src/zmapWindow/zmapWindowDNAList_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 4 14:19 2008 (rds)
* Created: Thu May 22 10:49:23 2008 (rds)
- * CVS info: $Id: zmapWindowDNAList_I.h,v 1.4 2010-03-04 15:12:49 mh17 Exp $
+ * CVS info: $Id: zmapWindowDNAList_I.h,v 1.5 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowDraw.c b/src/zmapWindow/zmapWindowDraw.c
index 1a13d96ef..485a29982 100755
--- a/src/zmapWindow/zmapWindowDraw.c
+++ b/src/zmapWindow/zmapWindowDraw.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: General drawing functions for zmap window, e.g.
* repositioning columns after one has been bumped
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Feb 15 11:52 2010 (edgrif)
* Created: Thu Sep 8 10:34:49 2005 (edgrif)
- * CVS info: $Id: zmapWindowDraw.c,v 1.125 2010-06-10 10:25:50 mh17 Exp $
+ * CVS info: $Id: zmapWindowDraw.c,v 1.126 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <glib.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapWindow/zmapWindowDrawFeatures.c b/src/zmapWindow/zmapWindowDrawFeatures.c
index 029bcd3e0..33be87c8e 100755
--- a/src/zmapWindow/zmapWindowDrawFeatures.c
+++ b/src/zmapWindow/zmapWindowDrawFeatures.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Draws genomic features in the data display window.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jun 11 16:09 2010 (edgrif)
* Created: Thu Jul 29 10:45:00 2004 (rnc)
- * CVS info: $Id: zmapWindowDrawFeatures.c,v 1.277 2010-06-11 16:06:36 edgrif Exp $
+ * CVS info: $Id: zmapWindowDrawFeatures.c,v 1.278 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapGLibUtils.h>
diff --git a/src/zmapWindow/zmapWindowDump.c b/src/zmapWindow/zmapWindowDump.c
index e881e8b4d..7cdbd033e 100755
--- a/src/zmapWindow/zmapWindowDump.c
+++ b/src/zmapWindow/zmapWindowDump.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Contains functions to output window contents in various
* formats (postscript, PNG etc.) to a file, i.e. a screen "dump".
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 19 13:38 2009 (rds)
* Created: Thu Mar 30 16:48:34 2006 (edgrif)
- * CVS info: $Id: zmapWindowDump.c,v 1.16 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowDump.c,v 1.17 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/* PLEASE READ THIS: there are some problems with understanding the coord/origin system, some
diff --git a/src/zmapWindow/zmapWindowExport.c b/src/zmapWindow/zmapWindowExport.c
index be2db5009..cf2a0f976 100755
--- a/src/zmapWindow/zmapWindowExport.c
+++ b/src/zmapWindow/zmapWindowExport.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Contains functions to export the _features_ in a window
* to a file in various formats (gff, zmap format etc.).
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Apr 25 13:47 2006 (edgrif)
* Created: Thu Mar 30 16:48:34 2006 (edgrif)
- * CVS info: $Id: zmapWindowExport.c,v 1.5 2010-03-04 15:12:52 mh17 Exp $
+ * CVS info: $Id: zmapWindowExport.c,v 1.6 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/* This file will contain functions to export features in the end.... */
diff --git a/src/zmapWindow/zmapWindowFeature.c b/src/zmapWindow/zmapWindowFeature.c
index 6dfdc61fb..a1083354c 100755
--- a/src/zmapWindow/zmapWindowFeature.c
+++ b/src/zmapWindow/zmapWindowFeature.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions that manipulate displayed features, they
* encapsulate handling of the feature context, the
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Jun 11 16:58 2010 (edgrif)
* Created: Mon Jan 9 10:25:40 2006 (edgrif)
- * CVS info: $Id: zmapWindowFeature.c,v 1.188 2010-06-11 16:06:36 edgrif Exp $
+ * CVS info: $Id: zmapWindowFeature.c,v 1.189 2010-06-14 15:40:15 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <math.h>
#include <ZMap/zmapFASTA.h>
diff --git a/src/zmapWindow/zmapWindowFeatureList.c b/src/zmapWindow/zmapWindowFeatureList.c
index cf45e7ef2..2c91002ce 100755
--- a/src/zmapWindow/zmapWindowFeatureList.c
+++ b/src/zmapWindow/zmapWindowFeatureList.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements a sortable list of feature(s) displaying
* coords, strand and much else.
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: May 20 10:15 2010 (edgrif)
* Created: Tue Sep 27 13:06:09 2005 (rds)
- * CVS info: $Id: zmapWindowFeatureList.c,v 1.34 2010-05-24 15:05:33 edgrif Exp $
+ * CVS info: $Id: zmapWindowFeatureList.c,v 1.35 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapFeature.h>
#include <ZMap/zmapBase.h>
#include <zmapWindowFeatureList_I.h>
diff --git a/src/zmapWindow/zmapWindowFeatureList.h b/src/zmapWindow/zmapWindowFeatureList.h
index e390a4f83..6a811696e 100755
--- a/src/zmapWindow/zmapWindowFeatureList.h
+++ b/src/zmapWindow/zmapWindowFeatureList.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: An extension/implementation of the ZMapGUITreeView class
* to display the details of a feature. In order that we
@@ -32,7 +33,7 @@
* HISTORY:
* Last edited: Jun 17 11:35 2009 (rds)
* Created: Wed Jun 4 13:17:50 2008 (rds)
- * CVS info: $Id: zmapWindowFeatureList.h,v 1.5 2010-03-04 15:12:55 mh17 Exp $
+ * CVS info: $Id: zmapWindowFeatureList.h,v 1.6 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowFeatureList_I.h b/src/zmapWindow/zmapWindowFeatureList_I.h
index 5edc228c8..9b08e8831 100755
--- a/src/zmapWindow/zmapWindowFeatureList_I.h
+++ b/src/zmapWindow/zmapWindowFeatureList_I.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 4 15:52 2008 (rds)
* Created: Thu May 22 10:49:23 2008 (rds)
- * CVS info: $Id: zmapWindowFeatureList_I.h,v 1.2 2010-03-04 15:12:56 mh17 Exp $
+ * CVS info: $Id: zmapWindowFeatureList_I.h,v 1.3 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowFeatureShow.c b/src/zmapWindow/zmapWindowFeatureShow.c
index 48a7ee115..78cdeda68 100755
--- a/src/zmapWindow/zmapWindowFeatureShow.c
+++ b/src/zmapWindow/zmapWindowFeatureShow.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements textual display of feature details in a
* gtk notebook widget.
@@ -34,10 +35,17 @@
* HISTORY:
* Last edited: Jun 12 23:10 2009 (rds)
* Created: Wed Jun 6 11:42:51 2007 (edgrif)
- * CVS info: $Id: zmapWindowFeatureShow.c,v 1.23 2010-03-04 15:12:57 mh17 Exp $
+ * CVS info: $Id: zmapWindowFeatureShow.c,v 1.24 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapFeature.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapWindow/zmapWindowFocus.c b/src/zmapWindow/zmapWindowFocus.c
index 939ddd297..c40cf0bec 100755
--- a/src/zmapWindow/zmapWindowFocus.c
+++ b/src/zmapWindow/zmapWindowFocus.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Code to implement "focus" items on the canvas.
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Apr 30 11:00 2010 (edgrif)
* Created: Tue Jan 16 09:46:23 2007 (rds)
- * CVS info: $Id: zmapWindowFocus.c,v 1.19 2010-06-10 14:50:32 mh17 Exp $
+ * CVS info: $Id: zmapWindowFocus.c,v 1.20 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <zmapWindow_P.h>
#include <zmapWindowContainerUtils.h>
diff --git a/src/zmapWindow/zmapWindowFrame.c b/src/zmapWindow/zmapWindowFrame.c
index 0f43847c0..36432895a 100755
--- a/src/zmapWindow/zmapWindowFrame.c
+++ b/src/zmapWindow/zmapWindowFrame.c
@@ -19,18 +19,26 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: Nov 19 16:55 2004 (edgrif)
* Created: Thu Apr 29 11:06:06 2004 (edgrif)
- * CVS info: $Id: zmapWindowFrame.c,v 1.7 2010-03-04 15:12:59 mh17 Exp $
+ * CVS info: $Id: zmapWindowFrame.c,v 1.8 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
/* WARNING, WARNING, THIS FILE IS NOT USED NOW AND IS PROBABLY DEFUNCT NOW............. */
diff --git a/src/zmapWindow/zmapWindowItem.c b/src/zmapWindow/zmapWindowItem.c
index e03e2395e..2257a8320 100755
--- a/src/zmapWindow/zmapWindowItem.c
+++ b/src/zmapWindow/zmapWindowItem.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions to manipulate canvas items.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Apr 30 11:01 2010 (edgrif)
* Created: Thu Sep 8 10:37:24 2005 (edgrif)
- * CVS info: $Id: zmapWindowItem.c,v 1.131 2010-04-30 10:11:44 edgrif Exp $
+ * CVS info: $Id: zmapWindowItem.c,v 1.132 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapGLibUtils.h>
diff --git a/src/zmapWindow/zmapWindowItemDebug.c b/src/zmapWindow/zmapWindowItemDebug.c
index 498d51aac..4882e6657 100755
--- a/src/zmapWindow/zmapWindowItemDebug.c
+++ b/src/zmapWindow/zmapWindowItemDebug.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,9 +30,16 @@
* HISTORY:
* Last edited: Jun 12 09:38 2009 (rds)
* Created: Tue Nov 6 16:33:44 2007 (rds)
- * CVS info: $Id: zmapWindowItemDebug.c,v 1.4 2010-03-04 15:13:01 mh17 Exp $
+ * CVS info: $Id: zmapWindowItemDebug.c,v 1.5 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+
+#include <ZMap/zmap.h>
+
+
+
+
+
#include <string.h>
#include <zmapWindow_P.h>
#include <zmapWindowContainerUtils.h>
diff --git a/src/zmapWindow/zmapWindowItemFactory.c b/src/zmapWindow/zmapWindowItemFactory.c
index 68c2a2200..20ebb9550 100755
--- a/src/zmapWindow/zmapWindowItemFactory.c
+++ b/src/zmapWindow/zmapWindowItemFactory.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Factory-object based set of functions for drawing
* features.
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Apr 28 09:49 2010 (edgrif)
* Created: Mon Sep 25 09:09:52 2006 (rds)
- * CVS info: $Id: zmapWindowItemFactory.c,v 1.82 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowItemFactory.c,v 1.83 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <string.h>
diff --git a/src/zmapWindow/zmapWindowItemFactory.h b/src/zmapWindow/zmapWindowItemFactory.h
index e32e2451c..62e574e2a 100755
--- a/src/zmapWindow/zmapWindowItemFactory.h
+++ b/src/zmapWindow/zmapWindowItemFactory.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 19 13:37 2009 (rds)
* Created: Mon Sep 25 09:09:52 2006 (rds)
- * CVS info: $Id: zmapWindowItemFactory.h,v 1.9 2010-03-04 15:13:03 mh17 Exp $
+ * CVS info: $Id: zmapWindowItemFactory.h,v 1.10 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowItemHash.c b/src/zmapWindow/zmapWindowItemHash.c
index 80e28e623..a18d8355e 100755
--- a/src/zmapWindow/zmapWindowItemHash.c
+++ b/src/zmapWindow/zmapWindowItemHash.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions to go from an alignment, block, column or feature
* in a feature context to the corresponding foocanvas group or item.
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Jul 3 15:19 2009 (rds)
* Created: Mon Jun 13 10:06:49 2005 (edgrif)
- * CVS info: $Id: zmapWindowItemHash.c,v 1.46 2010-03-04 15:13:04 mh17 Exp $
+ * CVS info: $Id: zmapWindowItemHash.c,v 1.47 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapFeature.h>
diff --git a/src/zmapWindow/zmapWindowItemText.c b/src/zmapWindow/zmapWindowItemText.c
index 8dd27bc95..c3143815f 100755
--- a/src/zmapWindow/zmapWindowItemText.c
+++ b/src/zmapWindow/zmapWindowItemText.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 9 14:24 2010 (edgrif)
* Created: Mon Apr 2 09:35:42 2007 (rds)
- * CVS info: $Id: zmapWindowItemText.c,v 1.28 2010-06-09 13:24:58 edgrif Exp $
+ * CVS info: $Id: zmapWindowItemText.c,v 1.29 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <string.h>
diff --git a/src/zmapWindow/zmapWindowItemTextFillColumn.h b/src/zmapWindow/zmapWindowItemTextFillColumn.h
index fa3f69805..e5225a261 100755
--- a/src/zmapWindow/zmapWindowItemTextFillColumn.h
+++ b/src/zmapWindow/zmapWindowItemTextFillColumn.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 16 08:48 2009 (rds)
* Created: Mon Apr 2 11:51:25 2007 (rds)
- * CVS info: $Id: zmapWindowItemTextFillColumn.h,v 1.6 2010-03-04 15:13:06 mh17 Exp $
+ * CVS info: $Id: zmapWindowItemTextFillColumn.h,v 1.7 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowList.c b/src/zmapWindow/zmapWindowList.c
index 828808eec..d646e2369 100755
--- a/src/zmapWindow/zmapWindowList.c
+++ b/src/zmapWindow/zmapWindowList.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk and,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Displays a list of features from which the user may select
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Mar 31 15:59 2010 (edgrif)
* Created: Thu Sep 16 10:17 2004 (rnc)
- * CVS info: $Id: zmapWindowList.c,v 1.77 2010-03-31 15:01:18 edgrif Exp $
+ * CVS info: $Id: zmapWindowList.c,v 1.78 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <glib.h>
#include <ZMap/zmapGFF.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapWindow/zmapWindowLongItems.c b/src/zmapWindow/zmapWindowLongItems.c
index dbb284b4d..f2a45167f 100755
--- a/src/zmapWindow/zmapWindowLongItems.c
+++ b/src/zmapWindow/zmapWindowLongItems.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: FooCanvas does not clip item extents to the maximum
* that XWindows (or any other windowing system) can
@@ -36,10 +37,17 @@
* HISTORY:
* Last edited: Jun 5 14:29 2009 (rds)
* Created: Thu Sep 7 14:56:34 2006 (edgrif)
- * CVS info: $Id: zmapWindowLongItems.c,v 1.18 2010-03-04 15:13:08 mh17 Exp $
+ * CVS info: $Id: zmapWindowLongItems.c,v 1.19 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <zmapWindow_P.h>
diff --git a/src/zmapWindow/zmapWindowMark.c b/src/zmapWindow/zmapWindowMark.c
index 99d1abb0e..f40d3f50d 100755
--- a/src/zmapWindow/zmapWindowMark.c
+++ b/src/zmapWindow/zmapWindowMark.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Feb 10 09:58 2010 (edgrif)
* Created: Tue Jan 16 09:51:19 2007 (rds)
- * CVS info: $Id: zmapWindowMark.c,v 1.23 2010-03-04 15:13:09 mh17 Exp $
+ * CVS info: $Id: zmapWindowMark.c,v 1.24 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <zmapWindow_P.h> /* ZMapWindow */
#include <zmapWindowMark_P.h>
diff --git a/src/zmapWindow/zmapWindowMark_P.h b/src/zmapWindow/zmapWindowMark_P.h
index b7558d2f6..207810ce1 100644
--- a/src/zmapWindow/zmapWindowMark_P.h
+++ b/src/zmapWindow/zmapWindowMark_P.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jan 21 21:59 2010 (roy)
* Created: Thu Jan 21 21:57:30 2010 (roy)
- * CVS info: $Id: zmapWindowMark_P.h,v 1.2 2010-03-04 15:13:10 mh17 Exp $
+ * CVS info: $Id: zmapWindowMark_P.h,v 1.3 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowMenus.c b/src/zmapWindow/zmapWindowMenus.c
index 28b73f952..2ca9a4d48 100755
--- a/src/zmapWindow/zmapWindowMenus.c
+++ b/src/zmapWindow/zmapWindowMenus.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Code implementing the menus for sequence display.
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 5 17:27 2010 (edgrif)
* Created: Thu Mar 10 07:56:27 2005 (edgrif)
- * CVS info: $Id: zmapWindowMenus.c,v 1.71 2010-05-06 12:00:00 edgrif Exp $
+ * CVS info: $Id: zmapWindowMenus.c,v 1.72 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapGLibUtils.h> /* zMap_g_hash_table_nth */
diff --git a/src/zmapWindow/zmapWindowNavigator.c b/src/zmapWindow/zmapWindowNavigator.c
index fc44efa06..6cf9cb240 100755
--- a/src/zmapWindow/zmapWindowNavigator.c
+++ b/src/zmapWindow/zmapWindowNavigator.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Apr 23 13:59 2010 (edgrif)
* Created: Wed Sep 6 11:22:24 2006 (rds)
- * CVS info: $Id: zmapWindowNavigator.c,v 1.61 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowNavigator.c,v 1.62 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <string.h>
#include <ZMap/zmapUtilsGUI.h>
diff --git a/src/zmapWindow/zmapWindowNavigatorMenus.c b/src/zmapWindow/zmapWindowNavigatorMenus.c
index 1b03e4258..366b5f349 100755
--- a/src/zmapWindow/zmapWindowNavigatorMenus.c
+++ b/src/zmapWindow/zmapWindowNavigatorMenus.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 29 16:57 2009 (rds)
* Created: Wed Oct 18 08:21:15 2006 (rds)
- * CVS info: $Id: zmapWindowNavigatorMenus.c,v 1.26 2010-03-04 15:13:13 mh17 Exp $
+ * CVS info: $Id: zmapWindowNavigatorMenus.c,v 1.27 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindowNavigator_P.h>
#include <ZMap/zmapUtils.h>
#include <zmapWindowContainerFeatureSet_I.h>
diff --git a/src/zmapWindow/zmapWindowNavigatorWidget.c b/src/zmapWindow/zmapWindowNavigatorWidget.c
index cdb49e9ea..339c17371 100755
--- a/src/zmapWindow/zmapWindowNavigatorWidget.c
+++ b/src/zmapWindow/zmapWindowNavigatorWidget.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Feb 16 10:05 2010 (edgrif)
* Created: Mon Sep 18 17:18:37 2006 (rds)
- * CVS info: $Id: zmapWindowNavigatorWidget.c,v 1.14 2010-03-04 15:13:14 mh17 Exp $
+ * CVS info: $Id: zmapWindowNavigatorWidget.c,v 1.15 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <zmapWindowCanvas.h>
#include <zmapWindowNavigator_P.h>
diff --git a/src/zmapWindow/zmapWindowNavigator_P.h b/src/zmapWindow/zmapWindowNavigator_P.h
index bf5390b4f..84be25cc9 100755
--- a/src/zmapWindow/zmapWindowNavigator_P.h
+++ b/src/zmapWindow/zmapWindowNavigator_P.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 10 10:48 2009 (rds)
* Created: Thu Sep 7 09:23:47 2006 (rds)
- * CVS info: $Id: zmapWindowNavigator_P.h,v 1.15 2010-03-04 15:13:15 mh17 Exp $
+ * CVS info: $Id: zmapWindowNavigator_P.h,v 1.16 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowOverlays.c b/src/zmapWindow/zmapWindowOverlays.c
index 7e69dfe82..82873c24c 100755
--- a/src/zmapWindow/zmapWindowOverlays.c
+++ b/src/zmapWindow/zmapWindowOverlays.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 19 13:47 2009 (rds)
* Created: Mon Mar 12 12:28:18 2007 (rds)
- * CVS info: $Id: zmapWindowOverlays.c,v 1.13 2010-03-04 15:13:16 mh17 Exp $
+ * CVS info: $Id: zmapWindowOverlays.c,v 1.14 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <gdk/gdk.h>
#include <string.h>
#include <zmapWindow_P.h>
diff --git a/src/zmapWindow/zmapWindowOverlays.h b/src/zmapWindow/zmapWindowOverlays.h
index 93f2411ca..65f3bf5e8 100755
--- a/src/zmapWindow/zmapWindowOverlays.h
+++ b/src/zmapWindow/zmapWindowOverlays.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Nov 9 13:40 2007 (rds)
* Created: Mon Mar 12 12:28:40 2007 (rds)
- * CVS info: $Id: zmapWindowOverlays.h,v 1.6 2010-03-04 15:13:17 mh17 Exp $
+ * CVS info: $Id: zmapWindowOverlays.h,v 1.7 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowPreferences.c b/src/zmapWindow/zmapWindowPreferences.c
index c094b3f3c..5a6dd4a70 100755
--- a/src/zmapWindow/zmapWindowPreferences.c
+++ b/src/zmapWindow/zmapWindowPreferences.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Oct 1 14:16 2008 (rds)
* Created: Fri Jun 6 12:29:16 2008 (roy)
- * CVS info: $Id: zmapWindowPreferences.c,v 1.5 2010-03-04 15:13:18 mh17 Exp $
+ * CVS info: $Id: zmapWindowPreferences.c,v 1.6 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapConfigIni.h>
#include <ZMap/zmapConfigStrings.h>
diff --git a/src/zmapWindow/zmapWindowPrint.c b/src/zmapWindow/zmapWindowPrint.c
index 5c56e7245..e08222cf6 100755
--- a/src/zmapWindow/zmapWindowPrint.c
+++ b/src/zmapWindow/zmapWindowPrint.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Contains functions to print current window.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Oct 1 14:51 2008 (rds)
* Created: Thu Mar 30 16:48:34 2006 (edgrif)
- * CVS info: $Id: zmapWindowPrint.c,v 1.8 2010-03-04 15:13:19 mh17 Exp $
+ * CVS info: $Id: zmapWindowPrint.c,v 1.9 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/zmapWindow/zmapWindowRemoteReceive.c b/src/zmapWindow/zmapWindowRemoteReceive.c
index eab30bea9..b0fe1e021 100755
--- a/src/zmapWindow/zmapWindowRemoteReceive.c
+++ b/src/zmapWindow/zmapWindowRemoteReceive.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Sep 8 08:51 2009 (edgrif)
* Created: Thu Jul 19 11:45:36 2007 (rds)
- * CVS info: $Id: zmapWindowRemoteReceive.c,v 1.13 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowRemoteReceive.c,v 1.14 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapWindow/zmapWindowRuler.c b/src/zmapWindow/zmapWindowRuler.c
index d11d40191..e3973e023 100755
--- a/src/zmapWindow/zmapWindowRuler.c
+++ b/src/zmapWindow/zmapWindowRuler.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements the scale bar shown for sequences.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jan 21 14:36 2008 (rds)
* Created: Thu Mar 9 16:09:18 2006 (rds)
- * CVS info: $Id: zmapWindowRuler.c,v 1.14 2010-03-04 15:13:21 mh17 Exp $
+ * CVS info: $Id: zmapWindowRuler.c,v 1.15 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapWindow_P.h>
#include <ZMap/zmapUtils.h>
#include <string.h>
diff --git a/src/zmapWindow/zmapWindowSearch.c b/src/zmapWindow/zmapWindowSearch.c
index a3d264795..ac4cb9e74 100755
--- a/src/zmapWindow/zmapWindowSearch.c
+++ b/src/zmapWindow/zmapWindowSearch.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Implements a search window which allows a user to
* specify align, block, set and feature patterns to
@@ -30,10 +31,17 @@
* HISTORY:
* Last edited: Jun 12 08:58 2009 (rds)
* Created: Fri Aug 12 16:53:21 2005 (edgrif)
- * CVS info: $Id: zmapWindowSearch.c,v 1.43 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowSearch.c,v 1.44 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <glib.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapWindow/zmapWindowState.c b/src/zmapWindow/zmapWindowState.c
index afd4f908d..afb95c472 100755
--- a/src/zmapWindow/zmapWindowState.c
+++ b/src/zmapWindow/zmapWindowState.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jan 22 12:12 2010 (edgrif)
* Created: Mon Jun 11 09:49:16 2007 (rds)
- * CVS info: $Id: zmapWindowState.c,v 1.26 2010-03-04 15:13:23 mh17 Exp $
+ * CVS info: $Id: zmapWindowState.c,v 1.27 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <zmapWindow_P.h>
diff --git a/src/zmapWindow/zmapWindowState.h b/src/zmapWindow/zmapWindowState.h
index aaf1c22ea..4302f1ddd 100755
--- a/src/zmapWindow/zmapWindowState.h
+++ b/src/zmapWindow/zmapWindowState.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: May 12 19:34 2008 (rds)
* Created: Mon Jun 11 09:49:16 2007 (rds)
- * CVS info: $Id: zmapWindowState.h,v 1.6 2010-03-04 15:13:24 mh17 Exp $
+ * CVS info: $Id: zmapWindowState.h,v 1.7 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowStats.c b/src/zmapWindow/zmapWindowStats.c
index e0517a3b4..e8eec6f69 100755
--- a/src/zmapWindow/zmapWindowStats.c
+++ b/src/zmapWindow/zmapWindowStats.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Functions for window statistics, e.g. number of boxes drawn.
* Note that individual feature stats are updated in the
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Jan 25 14:49 2010 (edgrif)
* Created: Tue Nov 7 10:10:25 2006 (edgrif)
- * CVS info: $Id: zmapWindowStats.c,v 1.15 2010-03-04 15:13:25 mh17 Exp $
+ * CVS info: $Id: zmapWindowStats.c,v 1.16 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap/zmapFeature.h>
diff --git a/src/zmapWindow/zmapWindowTextPositioner.c b/src/zmapWindow/zmapWindowTextPositioner.c
index f233f3745..2262bafde 100755
--- a/src/zmapWindow/zmapWindowTextPositioner.c
+++ b/src/zmapWindow/zmapWindowTextPositioner.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -31,10 +32,17 @@
* HISTORY:
* Last edited: Feb 16 10:11 2010 (edgrif)
* Created: Thu Jan 18 16:19:10 2007 (rds)
- * CVS info: $Id: zmapWindowTextPositioner.c,v 1.10 2010-03-04 15:13:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowTextPositioner.c,v 1.11 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapUtils.h>
#include <zmapWindow_P.h>
#include <zmapWindowContainerUtils.h>
diff --git a/src/zmapWindow/zmapWindowTextPositioner.h b/src/zmapWindow/zmapWindowTextPositioner.h
index 7b47ae55f..eafb15e8f 100755
--- a/src/zmapWindow/zmapWindowTextPositioner.h
+++ b/src/zmapWindow/zmapWindowTextPositioner.h
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Jun 5 16:38 2008 (rds)
* Created: Tue Mar 13 09:48:56 2007 (rds)
- * CVS info: $Id: zmapWindowTextPositioner.h,v 1.3 2010-03-04 15:13:27 mh17 Exp $
+ * CVS info: $Id: zmapWindowTextPositioner.h,v 1.4 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindowUtils.c b/src/zmapWindow/zmapWindowUtils.c
index 4358987a8..63f6125ce 100755
--- a/src/zmapWindow/zmapWindowUtils.c
+++ b/src/zmapWindow/zmapWindowUtils.c
@@ -19,8 +19,9 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Utility functions for the zMapWindow code.
*
@@ -28,10 +29,17 @@
* HISTORY:
* Last edited: Jan 22 11:22 2010 (edgrif)
* Created: Thu Jan 20 14:43:12 2005 (edgrif)
- * CVS info: $Id: zmapWindowUtils.c,v 1.62 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindowUtils.c,v 1.63 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <math.h>
#include <gdk/gdkkeysyms.h>
diff --git a/src/zmapWindow/zmapWindowZoomControl.c b/src/zmapWindow/zmapWindowZoomControl.c
index 9d0796168..0c429497e 100755
--- a/src/zmapWindow/zmapWindowZoomControl.c
+++ b/src/zmapWindow/zmapWindowZoomControl.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Mar 17 15:51 2009 (edgrif)
* Created: Fri Jul 8 11:37:39 2005 (rds)
- * CVS info: $Id: zmapWindowZoomControl.c,v 1.19 2010-03-04 15:13:29 mh17 Exp $
+ * CVS info: $Id: zmapWindowZoomControl.c,v 1.20 2010-06-14 15:40:16 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <math.h>
#include <zmapWindowZoomControl_P.h>
diff --git a/src/zmapWindow/zmapWindowZoomControl_P.h b/src/zmapWindow/zmapWindowZoomControl_P.h
index fe2de8872..1af57184f 100755
--- a/src/zmapWindow/zmapWindowZoomControl_P.h
+++ b/src/zmapWindow/zmapWindowZoomControl_P.h
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Mar 17 12:21 2009 (edgrif)
* Created: Tue Jul 12 16:02:52 2005 (rds)
- * CVS info: $Id: zmapWindowZoomControl_P.h,v 1.10 2010-03-04 15:13:30 mh17 Exp $
+ * CVS info: $Id: zmapWindowZoomControl_P.h,v 1.11 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
diff --git a/src/zmapWindow/zmapWindow_P.h b/src/zmapWindow/zmapWindow_P.h
index 4267035cb..61815602d 100755
--- a/src/zmapWindow/zmapWindow_P.h
+++ b/src/zmapWindow/zmapWindow_P.h
@@ -19,15 +19,16 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* and was written by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description: Defines internal interfaces/data structures of zMapWindow.
*
* HISTORY:
* Last edited: May 24 13:37 2010 (edgrif)
* Created: Fri Aug 1 16:45:58 2003 (edgrif)
- * CVS info: $Id: zmapWindow_P.h,v 1.261 2010-06-08 08:31:26 mh17 Exp $
+ * CVS info: $Id: zmapWindow_P.h,v 1.262 2010-06-14 15:40:17 mh17 Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_P_H
diff --git a/src/zmapXML/example_xml_writer.c b/src/zmapXML/example_xml_writer.c
index ee2a4c814..695bd6964 100755
--- a/src/zmapXML/example_xml_writer.c
+++ b/src/zmapXML/example_xml_writer.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Aug 14 09:13 2009 (edgrif)
* Created: Thu Feb 1 08:31:56 2007 (rds)
- * CVS info: $Id: example_xml_writer.c,v 1.5 2010-03-04 15:13:36 mh17 Exp $
+ * CVS info: $Id: example_xml_writer.c,v 1.6 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <ZMap/zmapXML.h>
static GArray *simple_xml_document(void);
diff --git a/src/zmapXML/zmapXMLAttribute.c b/src/zmapXML/zmapXMLAttribute.c
index ec9ae2c6f..6f747c4b5 100755
--- a/src/zmapXML/zmapXMLAttribute.c
+++ b/src/zmapXML/zmapXMLAttribute.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 19 22:30 2006 (rds)
* Created: Fri Aug 5 14:20:13 2005 (rds)
- * CVS info: $Id: zmapXMLAttribute.c,v 1.6 2010-03-04 15:13:37 mh17 Exp $
+ * CVS info: $Id: zmapXMLAttribute.c,v 1.7 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapXML_P.h>
ZMapXMLAttribute zmapXMLAttributeCreate(const XML_Char *name,
diff --git a/src/zmapXML/zmapXMLDocument.c b/src/zmapXML/zmapXMLDocument.c
index 6f520a4f7..eaabf8319 100755
--- a/src/zmapXML/zmapXMLDocument.c
+++ b/src/zmapXML/zmapXMLDocument.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: May 19 22:31 2006 (rds)
* Created: Tue Aug 9 14:25:26 2005 (rds)
- * CVS info: $Id: zmapXMLDocument.c,v 1.5 2010-03-04 15:13:38 mh17 Exp $
+ * CVS info: $Id: zmapXMLDocument.c,v 1.6 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapXML_P.h>
ZMapXMLDocument zMapXMLDocumentCreate(const XML_Char *version,
diff --git a/src/zmapXML/zmapXMLElement.c b/src/zmapXML/zmapXMLElement.c
index fd2b246b9..b74fcdebe 100755
--- a/src/zmapXML/zmapXMLElement.c
+++ b/src/zmapXML/zmapXMLElement.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Nov 13 21:55 2006 (rds)
* Created: Fri Aug 5 14:33:49 2005 (rds)
- * CVS info: $Id: zmapXMLElement.c,v 1.13 2010-03-04 15:13:39 mh17 Exp $
+ * CVS info: $Id: zmapXMLElement.c,v 1.14 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <string.h>
#include <zmapXML_P.h>
diff --git a/src/zmapXML/zmapXMLParse.c b/src/zmapXML/zmapXMLParse.c
index f15a3d597..748a57ec1 100755
--- a/src/zmapXML/zmapXMLParse.c
+++ b/src/zmapXML/zmapXMLParse.c
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Dec 18 10:00 2008 (rds)
* Created: Fri Aug 5 12:49:50 2005 (rds)
- * CVS info: $Id: zmapXMLParse.c,v 1.25 2010-03-04 15:13:40 mh17 Exp $
+ * CVS info: $Id: zmapXMLParse.c,v 1.26 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <stdio.h>
#include <expat.h>
#include <glib.h>
diff --git a/src/zmapXML/zmapXMLUtils.c b/src/zmapXML/zmapXMLUtils.c
index 8f16b9a21..204ed6ead 100755
--- a/src/zmapXML/zmapXMLUtils.c
+++ b/src/zmapXML/zmapXMLUtils.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Feb 14 14:03 2007 (rds)
* Created: Fri Feb 9 09:16:56 2007 (rds)
- * CVS info: $Id: zmapXMLUtils.c,v 1.2 2010-03-04 15:13:41 mh17 Exp $
+ * CVS info: $Id: zmapXMLUtils.c,v 1.3 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapXML_P.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapXML/zmapXMLWriter.c b/src/zmapXML/zmapXMLWriter.c
index 14e85da80..5355ee5a2 100755
--- a/src/zmapXML/zmapXMLWriter.c
+++ b/src/zmapXML/zmapXMLWriter.c
@@ -20,8 +20,9 @@
* This file is part of the ZMap genome database package
* originally written by:
*
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,10 +30,17 @@
* HISTORY:
* Last edited: Jun 14 20:10 2007 (rds)
* Created: Tue Jul 18 16:49:49 2006 (rds)
- * CVS info: $Id: zmapXMLWriter.c,v 1.7 2010-03-04 15:13:42 mh17 Exp $
+ * CVS info: $Id: zmapXMLWriter.c,v 1.8 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
+#include <ZMap/zmap.h>
+
+
+
+
+
+
#include <zmapXML_P.h>
#include <ZMap/zmapUtils.h>
diff --git a/src/zmapXML/zmapXML_P.h b/src/zmapXML/zmapXML_P.h
index 499548c0c..ce2a6c5fe 100755
--- a/src/zmapXML/zmapXML_P.h
+++ b/src/zmapXML/zmapXML_P.h
@@ -19,9 +19,10 @@
*-------------------------------------------------------------------
* This file is part of the ZMap genome database package
* originated by
- * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
- * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
- * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
+ * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
+ * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk,
+ * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk,
+ * Malcolm Hinsley (Sanger Institute, UK) mh17@sanger.ac.uk
*
* Description:
*
@@ -29,7 +30,7 @@
* HISTORY:
* Last edited: Oct 17 11:37 2008 (rds)
* Created: Fri Aug 5 12:50:44 2005 (rds)
- * CVS info: $Id: zmapXML_P.h,v 1.16 2010-03-04 15:13:43 mh17 Exp $
+ * CVS info: $Id: zmapXML_P.h,v 1.17 2010-06-14 15:40:18 mh17 Exp $
*-------------------------------------------------------------------
*/
--
GitLab