Skip to content

Commit

Permalink
ENH: move external code to the correct folder. It helps tracking exte…
Browse files Browse the repository at this point in the history
…rnal code per source, and their licence.

git-svn-id: svn+ssh://orchestra.med.harvard.edu/svn/megason/Code/GoFigure2@1065 ef826fda-c0ae-4237-af8e-f8dcbcf7929c
  • Loading branch information
agouaillard committed Mar 23, 2009
1 parent 28fc8f5 commit 23fc6b9
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 31 deletions.
1 change: 0 additions & 1 deletion trunk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ IF( VTK_FOUND )
ADD_EXECUTABLE( gofigure
#MACOSX_BUNDLE
gofigure.cxx
qticonloader.cxx
${QGOFIGURE_SOURCE_DIR}/ExternalCode/itkQt/itkQtProgressBar.cxx
${QGOFIGURE_SOURCE_DIR}/ExternalCode/vtkLSM/vtkLSMReader.cxx
${QGOMAINWINDOW_SRC}
Expand Down
File renamed without changes.
File renamed without changes.
95 changes: 65 additions & 30 deletions trunk/QGoMainWindow.cxx
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
/*=========================================================================
Authors: The GoFigure Dev. Team.
at Megason Lab, Systems biology, Harvard Medical school, 2009
Copyright (c) 2009, President and Fellows of Harvard College.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
Neither the name of the President and Fellows of Harvard College
nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/

#include "QGoMainWindow.h"

#include <iostream>
Expand Down Expand Up @@ -517,18 +551,19 @@ void QGoMainWindow::DisplayInTab( vtkImageData* myImage, int TabIndex )
// *****************************************************************************
void QGoMainWindow::on_actionAbout_activated( )
{
QString version( tr( "v2.0" ) );
QString version( tr( "v0.5" ) );

QString about_gofigure( tr( "GoFigure V2 \n\n" ) );

QString authors( tr( "Authors in alphabetical order:\n" ) );
authors.append( " * 2008 ~ Arnaud Gelas\n" );
authors.append( " * 2007 ~ Alexandre Gouaillard\n" );
authors.append( " * 2002 ~ Sean Megason\n" );
authors.append( " * 2008 ~ Kishore Mosaliganti\n" );
authors.append( " * 2008 ~ Lydie Souhait\n" );
authors.append( " * 2008 ~ Lydie Souhait\n\n" );
authors.append( " * Principal Investigator\n" );
authors.append( " * Sean Megason\n" );

QString message = QString( "GoFigure %1\n\n" ).arg( version );
QString message = QString( "GoFigure V2 %1\n\n" ).arg( version );
message.append( about_gofigure );
message.append( authors );

Expand Down Expand Up @@ -657,33 +692,33 @@ void QGoMainWindow::UpdateFullScreenViewButtons(int idx)
{
int whichview = 0;
whichview = m_PageView[idx]->GetFullScreenView();
switch( whichview )
{
default:
case 0:
{ this->actionQuad_View->setChecked(true);
break;
}
case 1:
{
switch( whichview )
{
default:
case 0:
{ this->actionQuad_View->setChecked(true);
break;
}
case 1:
{
this->actionFull_screen_XY->setChecked(true);
break;
}
case 2:
{
this->actionFull_screen_XZ->setChecked(true);
break;
}
case 3:
{
this->actionFull_screen_YZ->setChecked(true);
break;
}
case 4:
{
this->actionFull_screen_XYZ->setChecked(true);
break;
}
break;
}
case 2:
{
this->actionFull_screen_XZ->setChecked(true);
break;
}
case 3:
{
this->actionFull_screen_YZ->setChecked(true);
break;
}
case 4:
{
this->actionFull_screen_XYZ->setChecked(true);
break;
}
}
}
}
34 changes: 34 additions & 0 deletions trunk/QGoMainWindow.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
/*=========================================================================
Authors: The GoFigure Dev. Team.
at Megason Lab, Systems biology, Harvard Medical school, 2009
Copyright (c) 2009, President and Fellows of Harvard College.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
Neither the name of the President and Fellows of Harvard College
nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/

#ifndef __QGoMainWindow_h
#define __QGoMainWindow_h

Expand Down
34 changes: 34 additions & 0 deletions trunk/gofigure.cxx
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
/*=========================================================================
Authors: The GoFigure Dev. Team.
at Megason Lab, Systems biology, Harvard Medical school, 2009
Copyright (c) 2009, President and Fellows of Harvard College.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
Neither the name of the President and Fellows of Harvard College
nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/

#include <qapplication.h>
#include "QGoMainWindow.h"
#include <qsplashscreen.h>
Expand Down

0 comments on commit 23fc6b9

Please sign in to comment.