Changeset 183:346cb41afda2


Ignore:
Timestamp:
01/12/2012 06:18:33 PM (7 years ago)
Author:
Dmitry Fedorov <fedorov@…>
Branch:
default
Phase:
public
Message:

updates for 4D image navigation and fixes for cache size

Location:
bioView3D
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • bioView3D/install/install.nsi

    r122 r183  
    11; bioView3D installation script
    22; Author: Dmitry V. Fedorov <www.dimin.net>
    3 ; ver: 0.0.14
     3; ver: 0.0.17
    44
    55;--------------------------------
     
    1515
    1616; The file to write
    17 OutFile "..\distr\bioview3d_win32_0-0-14.exe"
     17OutFile "..\distr\bioview3d_win32_0-0-17.exe"
    1818
    1919; The default installation directory
     
    2727
    2828; The text to prompt the user to enter a directory
    29 ComponentText "This will install bioView3D 0.0.14 on your computer. Select which optional things you want installed."
     29ComponentText "This will install bioView3D 0.0.17 on your computer. Select which optional things you want installed."
    3030; The text to prompt the user to enter a directory
    3131DirText "Choose a directory to install in to:"
  • bioView3D/install/install_x64.nsi

    r122 r183  
    11; bioView3D installation script
    22; Author: Dmitry V. Fedorov <www.dimin.net>
    3 ; ver: 0.0.14
     3; ver: 0.1.17
    44
    55;--------------------------------
     
    1515
    1616; The file to write
    17 OutFile "..\distr\bioview3d_win64_0-0-14.exe"
     17OutFile "..\distr\bioview3d_win64_0-1-17.exe"
    1818
    1919; The default installation directory
     
    2727
    2828; The text to prompt the user to enter a directory
    29 ComponentText "This will install bioView3D 0.0.14 for Win64 on your computer. Select which optional things you want installed."
     29ComponentText "This will install bioView3D 0.1.17 for Win64 on your computer. Select which optional things you want installed."
    3030; The text to prompt the user to enter a directory
    3131DirText "Choose a directory to install in to:"
  • bioView3D/libsrc/libbioimg/formats_api/bim_image_5d.cpp

    r174 r183  
    2828
    2929bim::Image5D::Image5D(): number_axis(5) {
     30  maximum_cache_size = 200 * 1024 * 1024; // 200MB
    3031  init();
    3132}
     
    4344  current_position.resize(0);
    4445  current_position.resize(bim::Image5D::number_axis, 0);
    45   maximum_cache_size = 200 * 1024 * 1024; // 200MB
    4646  loop_time = true;
    4747}
  • bioView3D/msvc2010/bioView3D.rc

    r181 r183  
    1414
    1515/////////////////////////////////////////////////////////////////////////////
    16 // English (U.S.) resources
     16// English (United States) resources
    1717
    1818#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
    19 #ifdef _WIN32
    2019LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
    2120#pragma code_page(1252)
    22 #endif //_WIN32
    2321
    2422#ifdef APSTUDIO_INVOKED
     
    5452
    5553VS_VERSION_INFO VERSIONINFO
    56  FILEVERSION 0,1,15,15
    57  PRODUCTVERSION 0,1,15,15
     54 FILEVERSION 0,1,17,17
     55 PRODUCTVERSION 0,1,17,17
    5856 FILEFLAGSMASK 0x17L
    5957#ifdef _DEBUG
     
    7169        BEGIN
    7270            VALUE "CompanyName", "Center for Bio-Image Informatics"
    73             VALUE "FileDescription", "bioView3D"
    74             VALUE "FileVersion", "0, 1, 15, 15"
     71            VALUE "FileDescription", "bioView3D using Qt 4.8.0"
     72            VALUE "FileVersion", "0.1.17.17"
    7573            VALUE "InternalName", "bioView3D"
    76             VALUE "LegalCopyright", "Copyright (C) 2010, Center for Bio-Image Informatics"
     74            VALUE "LegalCopyright", "Copyright (C) 2010-2012, Center for Bio-Image Informatics & Dima Fedorov <www.dimin.net>"
    7775            VALUE "OriginalFilename", "bioView3D"
    7876            VALUE "ProductName", "bioView3D"
    79             VALUE "ProductVersion", "0, 1, 15, 15"
     77            VALUE "ProductVersion", "0.1.17.17"
    8078        END
    8179    END
     
    9795MAIN_ICON               ICON                    "..\\icons\\bioView_32px_256c.ico"
    9896ICON_96px               ICON                    "..\\icons\\bioView_96px_256c.ico"
    99 #endif    // English (U.S.) resources
     97#endif    // English (United States) resources
    10098/////////////////////////////////////////////////////////////////////////////
    10199
  • bioView3D/src/glwidget.cpp

    r181 r183  
    3030#endif
    3131#endif
     32
     33#if !defined(__glu_h__) || !defined(__GLU_H__)
     34#include <GL/glu.h>
     35#endif
     36
    3237
    3338#include <cmath>
     
    148153  connect(trans_timer, SIGNAL(timeout()), this, SLOT(onTransTimer()));
    149154
    150   image5d.setMaximumCacheSize(
    151     DConfig::getValue( QApplication::organizationName(), QApplication::applicationName(), "maximum_cache_size", image5d.getMaximumCacheSize() ).toDouble() );
    152 
     155  double cs = DConfig::getValue( QApplication::organizationName(), QApplication::applicationName(), "maximum_cache_size", image5d.getMaximumCacheSize() ).toDouble();
     156  image5d.setMaximumCacheSize(cs);
    153157
    154158  grabGesture(Qt::PinchGesture);
     
    12151219  if (image5d.stack()->size() <= 0) return;
    12161220  //in_progress = true;
    1217   if (!disable_progress) emit startProgress();
     1221  if (!disable_progress) emit startProgressLight();
    12181222
    12191223  if (rendering_method == rmTextures)
     
    18471851  if (this->getRenderingMethod() == GLWidget::rmTextures) {
    18481852    this->createVolume(disable_progress);
     1853    //this->createVolume(true);
    18491854    this->update();
    18501855  }
     
    18541859void GLWidget::onSetTimeCache() {
    18551860 bool ok;
    1856  int cs = image5d.getMaximumCacheSize() / 1024.0 / 1024.0;
    1857  cs = QInputDialog::getInt(this, tr("QInputDialog::getText()"), tr("Maximum time cache size (MB):"), cs, 0, 2147483647, 1, &ok);
     1861 double cs = image5d.getMaximumCacheSize() / 1024.0 / 1024.0;
     1862 cs = QInputDialog::getInt(this, tr("QInputDialog::getText()"), tr("Maximum time cache size (MB):"), (int) cs, 0, 2147483647, 1, &ok);
    18581863 if (ok) {
    1859    image5d.setMaximumCacheSize(cs * 1024 * 1024);
     1864   cs = cs * 1024 * 1024;
     1865   image5d.setMaximumCacheSize(cs);
    18601866   DConfig::setValue( QApplication::organizationName(), QApplication::applicationName(), "maximum_cache_size", cs );   
    18611867 }
  • bioView3D/src/glwidget.h

    r181 r183  
    9393  void sendProgress( const QString &, unsigned int done, unsigned int total );
    9494  void sendStartProgress() { emit startProgress(); }
     95  void sendStartProgressLight() { emit startProgressLight(); }
    9596  void sendStartProgressNow() { emit startProgressNow(); }
    9697  void sendStopProgress() { emit stopProgress(); }
     
    220221
    221222  void startProgress();
     223  void startProgressLight();
    222224  void startProgressNow();
    223225  void inProgress( const QString &, unsigned int done, unsigned int total );
  • bioView3D/src/widgets/d_progress_widget.h

    r181 r183  
    5151public slots:
    5252  void start( bool allow_interrupt = false, DisplayStyle style = DProgressAbstractWidget::normal );
     53  void startLight( bool allow_interrupt = false, DisplayStyle style = DProgressAbstractWidget::light ) { this->start( allow_interrupt, style ); }
    5354  void startNow( bool allow_interrupt = false, DisplayStyle style = DProgressAbstractWidget::normal );
    5455  void startUndefined( bool allow_interrupt = false, DisplayStyle style = DProgressAbstractWidget::normal );
  • bioView3D/src/window.cpp

    r182 r183  
    1818#define BV_APPLICATION     "BioView3D"
    1919#define BV_CONFIG_FILE     "bioview3d.ini"
    20 #define BV_VERSION         "0.1.16"
     20#define BV_VERSION         "0.1.17"
    2121
    2222#include <string>
     
    164164
    165165  connect(ui.glWidget, SIGNAL(startProgress()), this, SLOT(onStartProgress()));
     166  connect(ui.glWidget, SIGNAL(startProgressLight()), this, SLOT(onStartProgressLight()));
    166167  connect(ui.glWidget, SIGNAL(startProgressNow()), this, SLOT(onStartProgressNow()));
    167168  connect(ui.glWidget, SIGNAL(inProgress( const QString &, unsigned int, unsigned int)), this, SLOT(onInProgress( const QString &, unsigned int, unsigned int)));
     
    609610void Window::about() {
    610611  QString msg;
    611   msg.sprintf( "<b>bioView3D ver: %s</b>, 2010<br>", BV_VERSION );
     612  msg.sprintf( "<b>bioView3D ver: %s</b>, 2012<br>", BV_VERSION );
    612613  msg += "Center for BioImage Informatics, UCSB<br />";
    613614  msg += "http://www.bioimage.ucsb.edu/<br />";
  • bioView3D/src/window.h

    r181 r183  
    9595  void onStartProgress( bool allow_interrupt = false ) { progress->start(allow_interrupt); }
    9696  void onStartProgressNow( bool allow_interrupt = false ) { progress->startNow(allow_interrupt); }
     97  void onStartProgressLight( bool allow_interrupt = false ) { progress->startLight(allow_interrupt); }
    9798  void onInProgress( const QString &s, unsigned int done, unsigned int total ) { progress->doProgress(s, done, total); }
    9899  void onStopProgress() { progress->stop(); }
Note: See TracChangeset for help on using the changeset viewer.