Skip to content
Snippets Groups Projects
Commit 9f8dea4f authored by edgrif's avatar edgrif
Browse files

more migration of Robs code into main branch.

parent b663cfda
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 171 additions and 122 deletions
src/include/ZMap/zmapControl.h
+ 5
− 5
View file @ 9f8dea4f
......@@ -25,13 +25,13 @@
* Description: Interface for creating, controlling and destroying ZMaps.
*
* HISTORY:
* Last edited: Jul 1 09:42 2004 (edgrif)
* Last edited: Jul 1 10:07 2004 (edgrif)
* Created: Mon Nov 17 08:04:32 2003 (edgrif)
* CVS info: $Id: zmapControl.h,v 1.1 2004-07-01 08:42:53 edgrif Exp $
* CVS info: $Id: zmapControl.h,v 1.2 2004-07-01 09:24:36 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAPCONTROL_H
#define ZMAPCONTROL_H
#ifndef ZMAP_CONTROL_H
#define ZMAP_CONTROL_H
/* It turns out we need some way to refer to zmapviews at this level, while I don't really
......@@ -65,4 +65,4 @@ gboolean zMapReset(ZMap zmap) ;
gboolean zMapDestroy(ZMap zmap) ;
#endif /* !ZMAPCONTROL_H */
#endif /* !ZMAP_CONTROL_H */
src/include/ZMap/zmapManager.h
+ 3
− 3
View file @ 9f8dea4f
......@@ -24,16 +24,16 @@
*
* Description:
* HISTORY:
* Last edited: May 17 16:25 2004 (edgrif)
* Last edited: Jul 1 09:50 2004 (edgrif)
* Created: Thu Jul 24 14:39:06 2003 (edgrif)
* CVS info: $Id: zmapManager.h,v 1.2 2004-05-17 16:21:40 edgrif Exp $
* CVS info: $Id: zmapManager.h,v 1.3 2004-07-01 09:24:37 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_MANAGER_H
#define ZMAP_MANAGER_H
#include <ZMap/zmapSys.h>
#include <ZMap/ZMap.h>
#include <ZMap/zmapControl.h>
/* Opaque type, contains list of current ZMaps. */
typedef struct _ZMapManagerStruct *ZMapManager ;
......
src/include/ZMap/zmapWindow.h
+ 4
− 4
View file @ 9f8dea4f
......@@ -27,9 +27,9 @@
* window displaying genome data.
*
* HISTORY:
* Last edited: Jun 29 11:56 2004 (edgrif)
* Last edited: Jun 30 15:41 2004 (edgrif)
* Created: Thu Jul 24 15:21:56 2003 (edgrif)
* CVS info: $Id: zmapWindow.h,v 1.5 2004-06-30 09:11:38 edgrif Exp $
* CVS info: $Id: zmapWindow.h,v 1.6 2004-07-01 09:24:37 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_H
......@@ -183,11 +183,11 @@ void zMapRegionFreeSegs (ZMapRegion *region);
GArray *zMapRegionGetDNA (ZMapRegion *region);
void zMapRegionFreeDNA (ZMapRegion *region);
GArray *zMapPaneNewBox2Col (ZMapPane pane, int elements);
void zMapPaneNewBox2Col (ZMapPane pane, int elements);
ZMapColumn *zMapPaneGetBox2Col (ZMapPane pane, int index);
GArray *zMapPaneSetBox2Col (ZMapPane pane, ZMapColumn *col, int index);
void zMapPaneFreeBox2Col (ZMapPane pane);
GArray *zMapPaneNewBox2Seg (ZMapPane pane, int elements);
void zMapPaneNewBox2Seg (ZMapPane pane, int elements);
ZMapFeature zMapPaneGetBox2Seg (ZMapPane pane, int index);
GArray *zMapPaneSetBox2Seg (ZMapPane pane, ZMapColumn *seg, int index);
void zMapPaneFreeBox2Seg (ZMapPane pane);
......
src/zmapControl/makefile
+ 2
− 2
View file @ 9f8dea4f
......@@ -11,8 +11,8 @@ MAKE_DIR = $(ROOT_DIRECTORY)/zmapMake
# local macros
CONT_PRIV_HDRS = ZMap_P.h
PUB_HDRS = ZMap.h
CONT_PRIV_HDRS = zmapControl_P.h
PUB_HDRS = zmapControl.h
CONT_SRC = zmapControl.c zmapControlWindow.c zmapControlWindowButtons.c zmapControlWindowFrame.c zmapControlWindowMenubar.c
CONT_OBJ = zmapControl.o zmapControlWindow.o zmapControlWindowButtons.o zmapControlWindowFrame.o zmapControlWindowMenubar.o
......
src/zmapControl/zmapControl.c
+ 3
− 3
View file @ 9f8dea4f
......@@ -26,9 +26,9 @@
* the window code and the threaded server code.
* Exported functions: See ZMap.h
* HISTORY:
* Last edited: Jun 25 13:14 2004 (edgrif)
* Last edited: Jul 1 09:52 2004 (edgrif)
* Created: Thu Jul 24 16:06:44 2003 (edgrif)
* CVS info: $Id: zmapControl.c,v 1.11 2004-06-25 13:36:19 edgrif Exp $
* CVS info: $Id: zmapControl.c,v 1.12 2004-07-01 09:25:28 edgrif Exp $
*-------------------------------------------------------------------
*/
......@@ -37,7 +37,7 @@
#include <gtk/gtk.h>
#include <ZMap/zmapView.h>
#include <ZMap/zmapUtils.h>
#include <ZMap_P.h>
#include <zmapControl_P.h>
/* ZMap debugging output. */
......
src/zmapControl/zmapControlWindow.c
+ 3
− 3
View file @ 9f8dea4f
......@@ -26,15 +26,15 @@
*
* Exported functions: See zmapTopWindow_P.h
* HISTORY:
* Last edited: Jun 25 13:50 2004 (rnc)
* Last edited: Jul 1 09:52 2004 (edgrif)
* Created: Fri May 7 14:43:28 2004 (edgrif)
* CVS info: $Id: zmapControlWindow.c,v 1.4 2004-06-28 15:06:39 rnc Exp $
* CVS info: $Id: zmapControlWindow.c,v 1.5 2004-07-01 09:25:28 edgrif Exp $
*-------------------------------------------------------------------
*/
#include <string.h>
#include <ZMap/zmapUtils.h>
#include <ZMap_P.h>
#include <zmapControl_P.h>
static void quitCB(GtkWidget *widget, gpointer cb_data) ;
......
src/zmapControl/zmapControlWindowButtons.c
+ 3
− 3
View file @ 9f8dea4f
......@@ -26,14 +26,14 @@
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: Jun 28 11:23 2004 (rnc)
* Last edited: Jul 1 09:53 2004 (edgrif)
* Created: Thu Jul 24 14:36:27 2003 (edgrif)
* CVS info: $Id: zmapControlWindowButtons.c,v 1.4 2004-06-28 15:07:35 rnc Exp $
* CVS info: $Id: zmapControlWindowButtons.c,v 1.5 2004-07-01 09:25:28 edgrif Exp $
*-------------------------------------------------------------------
*/
#include <string.h>
#include <ZMap_P.h>
#include <zmapControl_P.h>
#include <../zmapWindow/zmapsplit.h>
static void newCB(GtkWidget *widget, gpointer cb_data) ;
......
src/zmapControl/zmapControlWindowFrame.c
+ 3
− 3
View file @ 9f8dea4f
......@@ -25,15 +25,15 @@
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: Jun 24 11:36 2004 (rnc)
* Last edited: Jul 1 09:53 2004 (edgrif)
* Created: Thu Apr 29 11:06:06 2004 (edgrif)
* CVS info: $Id: zmapControlWindowFrame.c,v 1.4 2004-06-28 15:08:48 rnc Exp $
* CVS info: $Id: zmapControlWindowFrame.c,v 1.5 2004-07-01 09:26:45 edgrif Exp $
*-------------------------------------------------------------------
*/
#include <stdlib.h>
#include <stdio.h>
#include <ZMap_P.h>
#include <zmapControl_P.h>
......
src/zmapControl/zmapControlWindowMenubar.c
+ 3
− 3
View file @ 9f8dea4f
......@@ -26,15 +26,15 @@
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: May 19 14:12 2004 (edgrif)
* Last edited: Jul 1 09:53 2004 (edgrif)
* Created: Thu Jul 24 14:36:59 2003 (edgrif)
* CVS info: $Id: zmapControlWindowMenubar.c,v 1.2 2004-05-20 14:11:33 edgrif Exp $
* CVS info: $Id: zmapControlWindowMenubar.c,v 1.3 2004-07-01 09:25:28 edgrif Exp $
*-------------------------------------------------------------------
*/
#include <stdlib.h>
#include <stdio.h>
#include <ZMap_P.h>
#include <zmapControl_P.h>
......
src/zmapControl/zmapControl_P.h
+ 4
− 2
View file @ 9f8dea4f
......@@ -25,9 +25,9 @@
* Description: Private header for interface that creates/manages/destroys
* instances of ZMaps.
* HISTORY:
* Last edited: Jul 1 09:45 2004 (edgrif)
* Last edited: Jul 1 09:58 2004 (edgrif)
* Created: Thu Jul 24 14:39:06 2003 (edgrif)
* CVS info: $Id: zmapControl_P.h,v 1.1 2004-07-01 08:46:27 edgrif Exp $
* CVS info: $Id: zmapControl_P.h,v 1.2 2004-07-01 09:25:28 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_CONTROL_P_H
......@@ -37,6 +37,8 @@
#include <ZMap/zmapSys.h>
#include <ZMap/zmapView.h>
#include <ZMap/zmapControl.h>
/* this should not be here........ */
#include <../zmapWindow/zmapWindow_P.h>
......
src/zmapUtils/makefile
+ 2
− 2
View file @ 9f8dea4f
......@@ -11,8 +11,8 @@ MAKE_DIR = $(ROOT_DIRECTORY)/zmapMake
# local macros
UTILS_PRIV_HDRS = ZMap_P.h
PUB_HDRS = ZMap.h
UTILS_PRIV_HDRS = zmapReadLine_P.h zmapUtils_P.h
PUB_HDRS = zmapReadLine.h zmapSys.h zmapUtils.h zmapUtilsCheck.h zmapUtilsDebug.h zmapUtilsLog.h zmapUtilsMesg.h
UTILS_SRC = zmapUtils.c zmapGUIutils.c zmapLogging.c zmapFileUtils.c zmapReadLine.c
UTILS_OBJ = zmapUtils.o zmapGUIutils.o zmapLogging.o zmapFileUtils.o zmapReadLine.o
......
src/zmapWindow/seqregion.c
+ 49
− 35
View file @ 9f8dea4f
/* Last edited: Jun 29 13:26 2004 (edgrif) */
/* file: seqregion.c
/* File: seqregion.c
* Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003
* Copyright (c) Sanger Institute, 2004
*-------------------------------------------------------------------
* Zmap is free software; you can redistribute it and/or
* ZMap is free software; you can redistribute it and/or
* 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.
* or see the on-line version at http://www.gnu.org/copyleft/gpl.txt
*-------------------------------------------------------------------
* 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
* originated by
* Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
* Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
*
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: Jun 30 13:58 2004 (edgrif)
* Created: Wed Jun 30 13:38:10 2004 (edgrif)
* CVS info: $Id: seqregion.c,v 1.5 2004-07-01 09:26:24 edgrif Exp $
*-------------------------------------------------------------------
*/
#include <seqregion.h>
/* srInvarCoord ***************************************************/
/* Returns a coordinate in the absolute direction. */
InvarCoord srInvarCoord(ZMapRegion *zMapRegion, Coord coord)
{
if (zMapRegion->rootIsReverse)
......@@ -39,9 +43,9 @@ InvarCoord srInvarCoord(ZMapRegion *zMapRegion, Coord coord)
return coord;
}
/* srCoord ********************************************************/
/* Returns a coordinate in the current direction. */
/* Returns a coordinate in the current direction. */
Coord srCoord(ZMapRegion *zMapRegion, InvarCoord coord)
{
if (zMapRegion->rootIsReverse)
......@@ -52,41 +56,51 @@ Coord srCoord(ZMapRegion *zMapRegion, InvarCoord coord)
/* srCreate ******************************************************/
/* Creates a new, empty ZMapRegion structure.Does nothing with the handle. */
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
ZMapRegion *srCreate(STORE_HANDLE handle)
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
/* this is not called from anywhere at the moment..... */
/* Creates a new, empty ZMapRegion structure. */
ZMapRegion *srCreate(void)
{
ZMapRegion *zMapRegion = (ZMapRegion*)malloc(sizeof(ZMapRegion));
ZMapRegion *zMapRegion = (ZMapRegion*)g_malloc(sizeof(ZMapRegion)) ;
zMapRegion->area1 = zMapRegion->area2 = 0;
zMapRegion->methods = NULL;
zMapRegion->oldMethods = NULL;
zMapRegion->dna = NULL;
return zMapRegion;
zMapRegion->area1 = zMapRegion->area2 = 0 ;
zMapRegion->methods = NULL ;
zMapRegion->oldMethods = NULL ;
zMapRegion->dna = NULL ;
return zMapRegion ;
}
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
/* srMethodFromID ***********************************************/
/* Retrieves a method structure from the methods array based on
* the ID it receives. Knows nothing of AceDB, which is why it's
* here, but could as well be in zmapcalls.c with it's sisters. */
srMeth *srMethodFromID(ZMapRegion *zMapRegion, methodID id)
{
int i;
srMeth *result = NULL ;
if (zMapRegion && zMapRegion->methods)
for (i = 0; i < zMapRegionGetMethods(zMapRegion)->len; i++)
{
srMeth *meth = g_ptr_array_index(zMapRegionGetMethods(zMapRegion), i);
if (meth->id == id)
return meth;
}
return NULL;
{
int i ;
for (i = 0 ; i < zMapRegionGetMethods(zMapRegion)->len ; i++)
{
srMeth *meth = g_ptr_array_index(zMapRegionGetMethods(zMapRegion), i) ;
if (meth->id == id)
{
result = meth ;
break ;
}
}
}
return result ;
}
......
src/zmapWindow/seqregion.h
+ 36
− 22
View file @ 9f8dea4f
/* Last edited: Jun 29 12:10 2004 (edgrif) */
/* file: seqregion.h
* Copyright (c) Sanger Institute, 2003
/* File: seqregion.h
* Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2004
*-------------------------------------------------------------------
* Zmap is free software; you can redistribute it and/or
* ZMap is free software; you can redistribute it and/or
* 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.
* or see the on-line version at http://www.gnu.org/copyleft/gpl.txt
*-------------------------------------------------------------------
* 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
* originated by
* Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk,
* Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk
*
* Description:
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
* Last edited: Jun 30 13:57 2004 (edgrif)
* Created: Wed Jun 30 13:50:48 2004 (edgrif)
* CVS info: $Id: seqregion.h,v 1.6 2004-07-01 09:26:24 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef SEQREGION_H
#define SEQREGION_H
#include <ZMap/zmapWindow.h>
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
#include <../acedb/acedb.h>
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
/* this is all wrong....this header or some parts of it should be in include/ZMap */
#include <../zmapWindow/zmapcalls.h>
/*
THIS HAS NOT COME TO PASS...........THE WHOLE SEQREGION FILE MAY
DISAPPEAR........
/*
This file defines the seqRegion interface.
The seqregion package populates a data structure with all the information
......@@ -50,26 +57,33 @@ No KEYS, classes or sMapInfos allowed.
*/
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
#define SEQUENCE 1
#define FEATURE 2
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
/* Routines */
/* Create a new one - must call srActivate next */
/* Create a new one - must call srActivate next */
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
ZMapRegion *srCreate(STORE_HANDLE handle);
/* totally unused currently........... */
ZMapRegion *srCreate() ;
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
ZMapRegion *srCreate();
/* Coordinate conversion. */
InvarCoord srInvarCoord(ZMapRegion *zMapRegion, Coord coord);
Coord srCoord(ZMapRegion *zMapRegion, InvarCoord coord);
/* Move from id to struct. */
srMeth *srMethodFromID(ZMapRegion *zmapRegion, methodID id);
#endif
/********************** end of file ************************/
src/zmapWindow/stringbucket.c
+ 2
− 2
View file @ 9f8dea4f
/* Last edited: Jun 29 13:36 2004 (edgrif) */
/* Last edited: Jun 30 14:32 2004 (edgrif) */
/* file: stringbucket.c
* Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003
......@@ -25,7 +25,7 @@
* Simon Kelley (Sanger Institute, UK) srk@sanger.ac.uk
*/
#include <strings.h>
#include <glib.h>
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
......
src/zmapWindow/zmapWindow.c
+ 10
− 5
View file @ 9f8dea4f
......@@ -28,9 +28,9 @@
*
* Exported functions: See ZMap/zmapWindow.h
* HISTORY:
* Last edited: Jun 29 15:52 2004 (edgrif)
* Last edited: Jun 30 15:47 2004 (edgrif)
* Created: Thu Jul 24 14:36:27 2003 (edgrif)
* CVS info: $Id: zmapWindow.c,v 1.12 2004-06-30 09:12:51 edgrif Exp $
* CVS info: $Id: zmapWindow.c,v 1.13 2004-07-01 09:26:25 edgrif Exp $
*-------------------------------------------------------------------
*/
......@@ -49,7 +49,7 @@
#include <ZMap/zmapFeature.h>
#include <zmapWindow_P.h>
#include <zmapcontrol.c>
static void dataEventCB(GtkWidget *widget, GdkEventClient *event, gpointer data) ;
......@@ -276,6 +276,7 @@ static void dataEventCB(GtkWidget *widget, GdkEventClient *event, gpointer cb_da
ZMapWindow zMapWindowCreateZMapWindow(void)
{
ZMapWindow window = (ZMapWindow)malloc(sizeof(ZMapWindowStruct));
return window;
}
......@@ -588,9 +589,11 @@ void zMapRegionFreeDNA(ZMapRegion *region)
// ZMapPane functions
GArray *zMapPaneNewBox2Col(ZMapPane pane, int elements)
void zMapPaneNewBox2Col(ZMapPane pane, int elements)
{
pane->box2col = g_array_sized_new(FALSE, TRUE, sizeof(ZMapColumn), elements);
return ;
}
......@@ -614,9 +617,11 @@ void zMapPaneFreeBox2Col(ZMapPane pane)
}
GArray *zMapPaneNewBox2Seg(ZMapPane pane, int elements)
void zMapPaneNewBox2Seg(ZMapPane pane, int elements)
{
pane->box2seg = g_array_sized_new(FALSE, TRUE, sizeof(ZMapFeatureStruct), elements);
return ;
}
GArray *zMapPaneSetBox2Seg(ZMapPane pane, ZMapColumn *seg, int index)
......
src/zmapWindow/zmapbccol.c
+ 3
− 12
View file @ 9f8dea4f
/* Last edited: Jun 29 15:21 2004 (edgrif) */
/* Last edited: Jun 30 14:36 2004 (edgrif) */
/* file: zmapbccol.c
* Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003
......@@ -31,22 +31,13 @@
started the Second Oil War.
I think the module name "nbc" is somehow appropriate - srk */
#include <math.h>
#include <glib.h>
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
#include <../acedb/method.h>
#include <../acedb/bump.h>
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
#include <ZMap/zmapcommon.h>
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
#include <ZMap/zmapFeature.h>
#include <zmapcontrol.h>
#include <seqregion.h>
/* A lot of this comes direct from acedb.......... */
......
src/zmapWindow/zmapcols.c
+ 8
− 1
View file @ 9f8dea4f
/* Last edited: Jun 29 15:48 2004 (edgrif) */
/* Last edited: Jul 1 10:10 2004 (edgrif) */
/* file: zmapcols.c
* Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003
......@@ -221,6 +221,11 @@ static void insertCol(ZMapPane pane, methodID meth, ZMapFeatureType type)
// c = g_ptr_array_index(pane->cols, j);
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
/* Needs sorting out............... */
c->drawFunc = defs[i].drawFunc;
c->configFunc = defs[i].configFunc;
c->selectFunc = defs[i].selectFunc;
......@@ -232,6 +237,8 @@ static void insertCol(ZMapPane pane, methodID meth, ZMapFeatureType type)
c->meth = meth; /* zero for default columns */
if (defs[i].initFunc)
(*defs[i].initFunc)(pane, c);
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
}
}
......
src/zmapWindow/zmapcontrol.c
+ 11
− 1
View file @ 9f8dea4f
/* Last edited: Jun 29 15:49 2004 (edgrif) */
/* Last edited: Jul 1 10:10 2004 (edgrif) */
/* file: zmapcontrol.c
* Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003
......@@ -28,7 +28,17 @@
#include <glib.h>
#include <zmapcontrol.h>
#include <zmapsplit.h>
#include <seqregion.h>
/* hack for now....... */
#include <../zmapControl/zmapControl_P.h>
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
static void *navAssoc, *winAssoc;
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
/* function prototypes ***********************************************/
......
src/zmapWindow/zmapcontrol.h
+ 17
− 11
View file @ 9f8dea4f
/* Last edited: Jun 29 13:10 2004 (edgrif) */
/* Last edited: Jul 1 10:06 2004 (edgrif) */
/* file: zmapcontrol.h
* Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003
......@@ -31,27 +31,33 @@
#include <gtk/gtk.h>
#include <libfoocanvas/libfoocanvas.h>
#include <ZMap/zmapControl.h>
#include <ZMap/zmapWindow.h>
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
#include <ZMap/zmapcommon.h>
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
#include <ZMap/zmapFeature.h>
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
#include <../zmapWindow/seqregion.h>
#include <../zmapControl/ZMap_P.h>
#include <../zmapControl/zmapControl_P.h>
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
/* function prototypes ************************************/
gboolean zMapDisplay(ZMap zmap,
Activate_cb act_cb,
Calc_cb calc_cb,
void *region,
char *seqspec,
char *fromspec,
gboolean isOldGraph);
Activate_cb act_cb,
Calc_cb calc_cb,
void *region,
char *seqspec,
char *fromspec,
gboolean isOldGraph);
void zmRegBox(ZMapPane pane, int box, ZMapColumn *col, void *seg);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment