r35280 - in /packages/kwwidgets/trunk/debian: changelog get-orig-source patches/00list patches/05_slicer-3-2.dpatch patches/12_path.dpatch patches/35_tcl.dpatch patches/66_soname.dpatch patches/77_doxygen.dpatch
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Sun Oct 26 11:14:45 UTC 2008
Author: domibel-guest
Date: Sun Oct 26 11:14:45 2008
New Revision: 35280
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35280
Log:
uses the main branch with backported patches for slicer
Added:
packages/kwwidgets/trunk/debian/patches/05_slicer-3-2.dpatch (with props)
Modified:
packages/kwwidgets/trunk/debian/changelog
packages/kwwidgets/trunk/debian/get-orig-source
packages/kwwidgets/trunk/debian/patches/00list
packages/kwwidgets/trunk/debian/patches/12_path.dpatch
packages/kwwidgets/trunk/debian/patches/35_tcl.dpatch
packages/kwwidgets/trunk/debian/patches/66_soname.dpatch
packages/kwwidgets/trunk/debian/patches/77_doxygen.dpatch
Modified: packages/kwwidgets/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/changelog?rev=35280&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/changelog (original)
+++ packages/kwwidgets/trunk/debian/changelog Sun Oct 26 11:14:45 2008
@@ -1,6 +1,5 @@
-kwwidgets (1.0.0-1) unstable; urgency=low
+kwwidgets (1.0.0~cvs20080526-1) unstable; urgency=low
* Initial release (Closes: #473045)
-- Dominique Belhachemi <domibel at cs.tu-berlin.de> Mon, 23 Aug 2008 16:21:52 +0000
-
Modified: packages/kwwidgets/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/get-orig-source?rev=35280&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/get-orig-source (original)
+++ packages/kwwidgets/trunk/debian/get-orig-source Sun Oct 26 11:14:45 2008
@@ -1,15 +1,17 @@
PACKAGE=kwwidgets
-VERSION=1.0.0
-#CVSDATE="29 Jun 2008"
+VERSION=1.0.0~cvs20080526
+CVSDATE="2008-05-26 23:59:59"
FOLDER=$PACKAGE-$VERSION
TARFILE=kwwidgets_$VERSION.orig.tar.gz
CVSHOME=:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets
-echo "ENTER PASSWORD : "
+echo "ENTER PASSWORD : (press return)"
cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets login
-cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets checkout -r Slicer-3-2 KWWidgets
+cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets checkout -D "$CVSDATE" KWWidgets
+# cvs -d:pserver:anoncvs at www.kwwidgets.org:/cvsroot/KWWidgets checkout -r Slicer-3-2 KWWidgets
+
# Remove all CVS directories
echo "Removing all CVS directories"
Modified: packages/kwwidgets/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/00list?rev=35280&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/00list (original)
+++ packages/kwwidgets/trunk/debian/patches/00list Sun Oct 26 11:14:45 2008
@@ -1,3 +1,4 @@
+05_slicer-3-2.dpatch
12_path.dpatch
35_tcl.dpatch
66_soname.dpatch
Added: packages/kwwidgets/trunk/debian/patches/05_slicer-3-2.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/05_slicer-3-2.dpatch?rev=35280&op=file
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/05_slicer-3-2.dpatch (added)
+++ packages/kwwidgets/trunk/debian/patches/05_slicer-3-2.dpatch Sun Oct 26 11:14:45 2008
@@ -1,0 +1,782 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_slicer-3-2.dpatch by <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: cvs diff -R -D "2008-05-26 23:59:59" -r Slicer-3-2
+
+ at DPATCH@
+diff -urNad kwwidgets-1.0.0~cvs20080526~/CMakeLists.txt kwwidgets-1.0.0~cvs20080526/CMakeLists.txt
+--- kwwidgets-1.0.0~cvs20080526~/CMakeLists.txt 2008-05-25 01:16:04.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/CMakeLists.txt 2008-10-26 11:34:44.000000000 +0100
+@@ -122,6 +122,10 @@
+ if(NOT KWWidgets_INSTALL_PACKAGE_DIR)
+ set(KWWidgets_INSTALL_PACKAGE_DIR ${KWWidgets_INSTALL_LIB_DIR}
+ CACHE INTERNAL "")
++ install_targets(
++ ${KWWidgets_INSTALL_LIB_DIR}
++ RUNTIME_DIRECTORY ${KWWidgets_INSTALL_BIN_DIR}
++ ${LIB_NAME})
+ endif(NOT KWWidgets_INSTALL_PACKAGE_DIR)
+
+ if(NOT KWWidgets_VTK_INSTALL_PACKAGE_DIR)
+@@ -769,6 +773,11 @@
+ endif(HTML_HELP_INCLUDE_PATH AND HTML_HELP_LIBRARY)
+ endif(WIN32)
+
++# link ApplicationServices.framework on OSX for vtkKWClipboardHelper
++IF(APPLE)
++ target_link_libraries (KWWidgets "-framework ApplicationServices")
++ENDIF(APPLE)
++
+ if(KWWidgets_USE_INTERNATIONALIZATION AND GETTEXT_RUNTIME_FOUND)
+ target_link_libraries(KWWidgets ${GETTEXT_LIBRARIES})
+ endif(KWWidgets_USE_INTERNATIONALIZATION AND GETTEXT_RUNTIME_FOUND)
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWClipboardHelper.cxx kwwidgets-1.0.0~cvs20080526/vtkKWClipboardHelper.cxx
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWClipboardHelper.cxx 2008-04-16 18:30:18.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWClipboardHelper.cxx 2008-10-26 11:34:44.000000000 +0100
+@@ -12,13 +12,13 @@
+
+ =========================================================================*/
+
+-#ifdef VTK_USE_APPLE_LOADER
++#ifdef __APPLE__
+ #include <AvailabilityMacros.h>
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1040
+ #include <Carbon/Carbon.h>
+ #define Cursor X11Cursor
+ #endif
+-#endif // VTK_USE_APPLE_LOADER
++#endif // __APPLE__
+
+ #include "vtkWindows.h"
+
+@@ -28,11 +28,11 @@
+ #include "vtkImageData.h"
+ #include "vtkObjectFactory.h"
+
+-#ifdef VTK_USE_APPLE_LOADER
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
++#ifdef __APPLE__
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1040
+ #undef Cursor
+ #endif
+-#endif // VTK_USE_APPLE_LOADER
++#endif // __APPLE__
+
+ vtkStandardNewMacro( vtkKWClipboardHelper );
+ vtkCxxRevisionMacro(vtkKWClipboardHelper, "1.0");
+@@ -71,8 +71,8 @@
+ #endif
+
+ // For MacOsX - 10.4+
+-#ifdef VTK_USE_APPLE_LOADER
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
++#ifdef __APPLE__
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1040
+
+ PasteboardRef pb = NULL;
+ if(noErr == PasteboardCreate(kPasteboardClipboard,&pb))
+@@ -165,8 +165,8 @@
+ #endif
+
+ // For MacOsX - 10.4+
+-#ifdef VTK_USE_APPLE_LOADER
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
++#ifdef __APPLE__
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1040
+
+ void* bitmapData;
+ int bytePRow = size[0]*4;
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWColorPickerWidget.cxx kwwidgets-1.0.0~cvs20080526/vtkKWColorPickerWidget.cxx
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWColorPickerWidget.cxx 2008-05-23 16:57:02.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWColorPickerWidget.cxx 2008-10-26 11:34:44.000000000 +0100
+@@ -39,7 +39,7 @@
+
+ //----------------------------------------------------------------------------
+ vtkStandardNewMacro( vtkKWColorPickerWidget );
+-vtkCxxRevisionMacro(vtkKWColorPickerWidget, "$Revision: 1.3 $");
++vtkCxxRevisionMacro(vtkKWColorPickerWidget, "$Revision: 1.3.2.1 $");
+
+ //----------------------------------------------------------------------------
+ vtkKWColorPickerWidget::vtkKWColorPickerWidget()
+@@ -76,14 +76,21 @@
+ this->ColorsLabelSet = NULL;
+ this->ColorsNameLabelSet = NULL;
+
++ this->InternalCurrentColorAsRGB[0] = -1; /* unitialized */
++ this->InternalCurrentColorAsRGB[1] = -1;
++ this->InternalCurrentColorAsRGB[2] = -1;
++ this->InternalCurrentColorAsHSV[0] = -1;
++ this->InternalCurrentColorAsHSV[1] = -1;
++ this->InternalCurrentColorAsHSV[2] = -1;
++
++ this->SetCurrentColorAsHSV(0.5, 1.0, 1.0);
++
+ this->InternalNewColorAsRGB[0] = -1; /* unitialized */
+ this->InternalNewColorAsRGB[1] = -1;
+ this->InternalNewColorAsRGB[2] = -1;
+ this->InternalNewColorAsHSV[0] = -1;
+ this->InternalNewColorAsHSV[1] = -1;
+ this->InternalNewColorAsHSV[2] = -1;
+-
+- this->SetNewColorAsHSV(0.5, 1.0, 1.0);
+ }
+
+ //----------------------------------------------------------------------------
+@@ -206,6 +213,19 @@
+
+ vtkKWIcon *icon = vtkKWIcon::New();
+
++
++ // --------------------------------------------------------------
++
++ if (this->InternalNewColorAsRGB[0] == -1 ||
++ this->InternalNewColorAsRGB[1] == -1 ||
++ this->InternalNewColorAsRGB[2] == -1 ||
++ this->InternalNewColorAsHSV[0] == -1 ||
++ this->InternalNewColorAsHSV[1] == -1 ||
++ this->InternalNewColorAsHSV[2] == -1)
++ {
++ this->SetNewColorAsHSV(this->GetCurrentColorAsHSV());
++ }
++
+ // --------------------------------------------------------------
+ // Notebook
+
+@@ -714,7 +734,7 @@
+ this->ColorsLabelSet->GetWidget(0), this->InternalNewColorAsRGB);
+
+ this->UpdateColorLabel(
+- this->ColorsLabelSet->GetWidget(1), this->InternalNewColorAsRGB);
++ this->ColorsLabelSet->GetWidget(1), this->InternalCurrentColorAsRGB);
+
+ this->UpdateHexadecimalColorEntry(this->InternalNewColorAsRGB);
+
+@@ -1069,6 +1089,178 @@
+ }
+
+ //----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::SetInternalCurrentColorAsRGB(double rgb[3])
++{
++ this->SetInternalCurrentColorAsRGB(rgb[0], rgb[1], rgb[2]);
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::SetInternalCurrentColorAsRGB(
++ double r, double g, double b)
++{
++ double range[2] = {0.0, 1.0};
++ vtkMath::ClampValue(&r, range);
++ vtkMath::ClampValue(&g, range);
++ vtkMath::ClampValue(&b, range);
++
++ if (r == this->InternalCurrentColorAsRGB[0] &&
++ g == this->InternalCurrentColorAsRGB[1] &&
++ b == this->InternalCurrentColorAsRGB[2])
++ {
++ return;
++ }
++
++ this->InternalCurrentColorAsRGB[0] = r;
++ this->InternalCurrentColorAsRGB[1] = g;
++ this->InternalCurrentColorAsRGB[2] = b;
++
++ this->Modified();
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::SetCurrentColorAsRGB(double r, double g, double b)
++{
++ double range[2] = {0.0, 1.0};
++ vtkMath::ClampValue(&r, range);
++ vtkMath::ClampValue(&g, range);
++ vtkMath::ClampValue(&b, range);
++
++ double current_rgb[3];
++ this->GetCurrentColorAsRGB(current_rgb);
++ if (r == current_rgb[0] && g == current_rgb[1] && b == current_rgb[2])
++ {
++ return;
++ }
++
++ this->Modified();
++
++ this->SetInternalCurrentColorAsRGB(r, g, b);
++
++ double h, s, v;
++ vtkMath::RGBToHSV(r, g, b, &h, &s, &v);
++ this->SetInternalCurrentColorAsHSV(h, s, v);
++
++ // Update UI (with RGB in mind)
++
++ if (this->ColorsLabelSet)
++ {
++ this->UpdateColorLabel(
++ this->ColorsLabelSet->GetWidget(1), this->InternalCurrentColorAsRGB);
++ }
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::SetCurrentColorAsRGB(double rgb[3])
++{
++ this->SetCurrentColorAsRGB(rgb[0], rgb[1], rgb[2]);
++}
++
++//----------------------------------------------------------------------------
++double* vtkKWColorPickerWidget::GetCurrentColorAsRGB()
++{
++ return this->GetInternalCurrentColorAsRGB();
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::GetCurrentColorAsRGB(
++ double &_arg1, double &_arg2, double &_arg3)
++{
++ this->GetInternalCurrentColorAsRGB(_arg1, _arg2, _arg3);
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::GetCurrentColorAsRGB(double _arg[3])
++{
++ this->GetCurrentColorAsRGB(_arg[0], _arg[1], _arg[2]);
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::SetInternalCurrentColorAsHSV(double hsv[3])
++{
++ this->SetInternalCurrentColorAsHSV(hsv[0], hsv[1], hsv[2]);
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::SetInternalCurrentColorAsHSV(
++ double h, double s, double v)
++{
++ double range[2] = {0.0, 1.0};
++ vtkMath::ClampValue(&h, range);
++ vtkMath::ClampValue(&s, range);
++ vtkMath::ClampValue(&v, range);
++
++ if (h == this->InternalCurrentColorAsHSV[0] &&
++ s == this->InternalCurrentColorAsHSV[1] &&
++ v == this->InternalCurrentColorAsHSV[2])
++ {
++ return;
++ }
++
++ this->InternalCurrentColorAsHSV[0] = h;
++ this->InternalCurrentColorAsHSV[1] = s;
++ this->InternalCurrentColorAsHSV[2] = v;
++
++ this->Modified();
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::SetCurrentColorAsHSV(double h, double s, double v)
++{
++ double range[2] = {0.0, 1.0};
++ vtkMath::ClampValue(&h, range);
++ vtkMath::ClampValue(&s, range);
++ vtkMath::ClampValue(&v, range);
++
++ double current_hsv[3];
++ this->GetCurrentColorAsHSV(current_hsv);
++ if (h == current_hsv[0] && s == current_hsv[1] && v == current_hsv[2])
++ {
++ return;
++ }
++
++ this->Modified();
++
++ this->SetInternalCurrentColorAsHSV(h, s, v);
++
++ double r, g, b;
++ vtkMath::HSVToRGB(h, s, v, &r, &g, &b);
++ this->SetInternalCurrentColorAsRGB(r, g, b);
++
++ // Update UI (with HSV in mind)
++
++ if (this->ColorsLabelSet)
++ {
++ this->UpdateColorLabel(
++ this->ColorsLabelSet->GetWidget(1), this->InternalCurrentColorAsRGB);
++ }
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::SetCurrentColorAsHSV(double hsv[3])
++{
++ this->SetCurrentColorAsHSV(hsv[0], hsv[1], hsv[2]);
++}
++
++//----------------------------------------------------------------------------
++double* vtkKWColorPickerWidget::GetCurrentColorAsHSV()
++{
++ return this->GetInternalCurrentColorAsHSV();
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::GetCurrentColorAsHSV(
++ double &_arg1, double &_arg2, double &_arg3)
++{
++ this->GetInternalCurrentColorAsHSV(_arg1, _arg2, _arg3);
++}
++
++//----------------------------------------------------------------------------
++void vtkKWColorPickerWidget::GetCurrentColorAsHSV(double _arg[3])
++{
++ this->GetCurrentColorAsHSV(_arg[0], _arg[1], _arg[2]);
++}
++
++//----------------------------------------------------------------------------
+ void vtkKWColorPickerWidget::UpdateSlidersRGB(double rgb[3])
+ {
+ int i;
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWColorPickerWidget.h kwwidgets-1.0.0~cvs20080526/vtkKWColorPickerWidget.h
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWColorPickerWidget.h 2008-05-23 16:57:02.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWColorPickerWidget.h 2008-10-26 11:34:44.000000000 +0100
+@@ -55,17 +55,34 @@
+ // Description:
+ // Set/Get the current color as RGB, or HSV.
+ virtual double *GetNewColorAsRGB();
+- virtual void GetNewColorAsRGB(double &_arg1, double &_arg2, double &_arg3);
++ virtual void GetNewColorAsRGB(double &, double &, double &);
+ virtual void GetNewColorAsRGB(double _arg[3]);
+ virtual void SetNewColorAsRGB(double r, double g, double b);
+ virtual void SetNewColorAsRGB(double rgb[3]);
+ virtual double *GetNewColorAsHSV();
+- virtual void GetNewColorAsHSV(double &_arg1, double &_arg2, double &_arg3);
++ virtual void GetNewColorAsHSV(double &, double &, double &);
+ virtual void GetNewColorAsHSV(double _arg[3]);
+ virtual void SetNewColorAsHSV(double r, double g, double b);
+ virtual void SetNewColorAsHSV(double rgb[3]);
+
+ // Description:
++ // Set/Get the current color as RGB, or HSV.
++ // WARNING: the "current" color is not the one that is modified
++ // interactively; the "new" color is (see Set/GetNewColorAs...). Think
++ // of the "current" color as a reference against which the user can
++ // compare his new choice at all time.
++ virtual double *GetCurrentColorAsRGB();
++ virtual void GetCurrentColorAsRGB(double &, double &, double &);
++ virtual void GetCurrentColorAsRGB(double _arg[3]);
++ virtual void SetCurrentColorAsRGB(double r, double g, double b);
++ virtual void SetCurrentColorAsRGB(double rgb[3]);
++ virtual double *GetCurrentColorAsHSV();
++ virtual void GetCurrentColorAsHSV(double &, double &, double &);
++ virtual void GetCurrentColorAsHSV(double _arg[3]);
++ virtual void SetCurrentColorAsHSV(double r, double g, double b);
++ virtual void SetCurrentColorAsHSV(double rgb[3]);
++
++ // Description:
+ // Access the color preset selector. Note that you can set their
+ // RegistryKey ivar to save/restore the favorites and history presets
+ // automatically (as done by the vtkKWColorPickerDialog class).
+@@ -133,7 +150,7 @@
+ virtual void Pack();
+
+ // Description:
+- // Set/Get internal colors.
++ // Set/Get internal new color.
+ double InternalNewColorAsRGB[3];
+ vtkGetVector3Macro(InternalNewColorAsRGB, double);
+ virtual void SetInternalNewColorAsRGB(double r, double g, double b);
+@@ -143,6 +160,17 @@
+ virtual void SetInternalNewColorAsHSV(double h, double s, double v);
+ virtual void SetInternalNewColorAsHSV(double hsv[3]);
+
++ // Description:
++ // Set/Get internal current color.
++ double InternalCurrentColorAsRGB[3];
++ vtkGetVector3Macro(InternalCurrentColorAsRGB, double);
++ virtual void SetInternalCurrentColorAsRGB(double r, double g, double b);
++ virtual void SetInternalCurrentColorAsRGB(double rgb[3]);
++ double InternalCurrentColorAsHSV[3];
++ vtkGetVector3Macro(InternalCurrentColorAsHSV, double);
++ virtual void SetInternalCurrentColorAsHSV(double h, double s, double v);
++ virtual void SetInternalCurrentColorAsHSV(double hsv[3]);
++
+ vtkKWFrame *SlidersFrame;
+
+ vtkKWFrame *RGBSlidersFrame;
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWComboBox.h kwwidgets-1.0.0~cvs20080526/vtkKWComboBox.h
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWComboBox.h 2006-10-19 23:46:30.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWComboBox.h 2008-10-26 11:34:44.000000000 +0100
+@@ -43,11 +43,16 @@
+ virtual void DeleteValue(int idx);
+ virtual int HasValue(const char* value);
+ virtual int GetValueIndex(const char* value);
+- virtual const char* GetValueFromIndex(int idx);
+ virtual int GetNumberOfValues();
+ virtual void DeleteAllValues();
+
+ // Description:
++ // Get the corresponding value given an index
++ // Note that the output of GetValueFromIndex is a pointer to a
++ // temporary buffer that should be copied *immediately* to your own storage.
++ virtual const char* GetValueFromIndex(int idx);
++
++ // Description:
+ // Replace the nth value in the combo box with another string value.
+ virtual void ReplaceNthValue( int n, const char* value );
+
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWFileBrowserDialog.cxx kwwidgets-1.0.0~cvs20080526/vtkKWFileBrowserDialog.cxx
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWFileBrowserDialog.cxx 2008-05-25 01:15:01.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWFileBrowserDialog.cxx 2008-10-26 11:34:44.000000000 +0100
+@@ -39,7 +39,7 @@
+
+ //----------------------------------------------------------------------------
+ vtkStandardNewMacro( vtkKWFileBrowserDialog );
+-vtkCxxRevisionMacro(vtkKWFileBrowserDialog, "$Revision: 1.43 $");
++vtkCxxRevisionMacro(vtkKWFileBrowserDialog, "$Revision: 1.43.2.1 $");
+
+ //----------------------------------------------------------------------------
+ class vtkKWFileBrowserDialogInternals
+@@ -563,10 +563,9 @@
+
+ if (this->FileTypesBox->GetNumberOfValues() > 0)
+ {
+- this->FileTypesBox->SetValue(
+- this->FileTypesBox->GetValueFromIndex(0));
+- this->FileTypeChangedCallback(
+- this->FileTypesBox->GetValueFromIndex(0));
++ vtksys_stl::string buffer(this->FileTypesBox->GetValueFromIndex(0));
++ this->FileTypesBox->SetValue(buffer.c_str());
++ this->FileTypeChangedCallback(buffer.c_str());
+ }
+
+ if (this->InitialFileName && *this->InitialFileName)
+@@ -671,10 +670,9 @@
+ this->PopulateFileTypes();
+ if (this->FileTypesBox->GetNumberOfValues() > 0)
+ {
+- this->FileTypesBox->SetValue(
+- this->FileTypesBox->GetValueFromIndex(0));
+- this->FileTypeChangedCallback(
+- this->FileTypesBox->GetValueFromIndex(0));
++ vtksys_stl::string buffer(this->FileTypesBox->GetValueFromIndex(0));
++ this->FileTypesBox->SetValue(buffer.c_str());
++ this->FileTypeChangedCallback(buffer.c_str());
+ }
+ }
+ }
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWMostRecentFilesManager.cxx kwwidgets-1.0.0~cvs20080526/vtkKWMostRecentFilesManager.cxx
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWMostRecentFilesManager.cxx 2008-02-06 23:48:52.000000000 +0100
++++ kwwidgets-1.0.0~cvs20080526/vtkKWMostRecentFilesManager.cxx 2008-10-26 11:34:44.000000000 +0100
+@@ -22,7 +22,7 @@
+ #include <vtksys/stl/list>
+ #include <vtksys/SystemTools.hxx>
+
+-vtkCxxRevisionMacro(vtkKWMostRecentFilesManager, "$Revision: 1.18 $");
++vtkCxxRevisionMacro(vtkKWMostRecentFilesManager, "$Revision: 1.18.2.1 $");
+ vtkStandardNewMacro(vtkKWMostRecentFilesManager );
+
+ #define VTK_KW_MRF_REGISTRY_FILENAME_KEYNAME_PATTERN "File%02d"
+@@ -518,8 +518,9 @@
+ label += "(";
+ }
+ label += vtksys::SystemTools::CropString(
+- this->BaseNameVisibilityInMenu
+- ? filename : vtksys::SystemTools::GetFilenamePath(filename), 40);
++ this->BaseNameVisibilityInMenu ?
++ vtksys_stl::string(filename) :
++ vtksys::SystemTools::GetFilenamePath(filename), 40);
+ if (has_label)
+ {
+ label += ")";
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWMultiColumnList.cxx kwwidgets-1.0.0~cvs20080526/vtkKWMultiColumnList.cxx
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWMultiColumnList.cxx 2008-05-25 01:15:28.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWMultiColumnList.cxx 2008-10-26 11:34:44.000000000 +0100
+@@ -22,6 +22,8 @@
+ #include "vtkKWFrame.h"
+ #include "vtkKWIcon.h"
+ #include "vtkKWLabel.h"
++#include "vtkKWLoadSaveButton.h"
++#include "vtkKWLoadSaveDialog.h"
+ #include "vtkKWMultiColumnList.h"
+ #include "vtkKWOptions.h"
+ #include "vtkKWRadioButton.h"
+@@ -38,7 +40,7 @@
+
+ //----------------------------------------------------------------------------
+ vtkStandardNewMacro(vtkKWMultiColumnList);
+-vtkCxxRevisionMacro(vtkKWMultiColumnList, "$Revision: 1.92 $");
++vtkCxxRevisionMacro(vtkKWMultiColumnList, "$Revision: 1.92.2.3 $");
+
+ //----------------------------------------------------------------------------
+ class vtkKWMultiColumnListInternals
+@@ -3315,6 +3317,117 @@
+ }
+
+ //----------------------------------------------------------------------------
++void vtkKWMultiColumnList::SetCellWindowCommandToPickDirectoryButton(
++ int row_index, int col_index)
++{
++ this->SetCellWindowCommand(row_index, col_index, NULL, NULL);
++ this->SetCellWindowCommand(
++ row_index, col_index, this,
++ "CellWindowCommandToPickDirectoryButtonCallback");
++ this->SetCellWindowDestroyCommandToRemoveChild(row_index, col_index);
++}
++
++//----------------------------------------------------------------------------
++vtkKWLoadSaveButton* vtkKWMultiColumnList::GetCellWindowAsPickDirectoryButton(
++ int row_index, int col_index)
++{
++ const char *child_name = this->GetCellWindowWidgetName(
++ row_index, col_index);
++ return vtkKWLoadSaveButton::SafeDownCast(
++ this->GetChildWidgetWithName(child_name));
++}
++
++//---------------------------------------------------------------------------
++void vtkKWMultiColumnList::CellWindowCommandToPickDirectoryButtonCallback(
++ const char *, int row, int col, const char *widget)
++{
++ vtkKWLoadSaveButton *child =
++ this->GetCellWindowAsPickDirectoryButton(row, col);
++ if (!child)
++ {
++ child = vtkKWLoadSaveButton::New();
++ child->SetWidgetName(widget);
++ child->SetParent(this);
++ child->Create();
++ child->SetPadX(0);
++ child->SetPadY(0);
++ child->TrimPathFromFileNameOff();
++ //child->SetMaximumFileNameLength(44);
++ child->GetLoadSaveDialog()->ChooseDirectoryOn();
++ child->Delete();
++ }
++
++ vtksys_stl::string cell_text(this->GetCellText(row, col));
++ child->GetLoadSaveDialog()->RetrieveLastPathFromRegistry(
++ "OpenPath");
++ if(!cell_text.empty() && vtksys::SystemTools::FileExists(cell_text.c_str()))
++ {
++ child->SetInitialFileName(cell_text.c_str());
++ }
++
++ child->SetEnabled(this->GetEnabled());
++
++ char command[256];
++ sprintf(command,
++ "CellWindowCommandToPickDirectoryButtonChangeCallback %s %d %d",
++ child->GetTclName(), row, col);
++ child->SetCommand(this, command);
++}
++
++//---------------------------------------------------------------------------
++void vtkKWMultiColumnList::CellWindowCommandToPickDirectoryButtonChangeCallback(
++ vtkKWWidget *widget, int row, int col)
++{
++ vtkKWLoadSaveButton *lsb = vtkKWLoadSaveButton::SafeDownCast(widget);
++ if (lsb)
++ {
++ // Make sure we are dealing with the right one
++ // Sometimes when a column is sorted, not *all* cells with a user-defined
++ // window are re-created. In our case, our user-defined vtkKWLoadSaveButton
++ // has its row,col location coded in its callback. Yet, sorting the
++ // column might have moved the vtkKWLoadSaveButton around, without re-creating
++ // it, i.e. without updating its callback. Let's check if this is the
++ // case, and look for the right location if not matching.
++
++ if (strcmp(widget->GetWidgetName(),
++ this->GetCellWindowWidgetName(row, col)))
++ {
++ for (row = 0; row < this->GetNumberOfRows(); row++)
++ {
++ if (!strcmp(widget->GetWidgetName(),
++ this->GetCellWindowWidgetName(row, col)))
++ {
++ break;
++ }
++ }
++ if (row == this->GetNumberOfRows())
++ {
++ return;
++ }
++ }
++
++
++ const char *newName = lsb->GetLoadSaveDialog()->GetFileName();
++
++ if(newName && *newName &&
++ !vtksys::SystemTools::ComparePath(this->GetCellText(row, col), newName))
++ {
++ this->SetCellText(row, col, newName);
++ lsb->SetInitialFileName(newName);
++
++ this->InvokeCellUpdatedCommand(row, col, newName);
++ this->RefreshCellWithWindowCommand(row, col);
++ }
++ else
++ {
++ lsb->SetInitialFileName(this->GetCellText(row, col));
++ }
++ this->InvokeEditEndCommand(row, col, newName);
++
++ }
++}
++
++//----------------------------------------------------------------------------
+ void vtkKWMultiColumnList::SetCellWindowCommandToComboBoxWithValuesAsSemiColonSeparated(
+ int row_index, int col_index, const char *values)
+ {
+@@ -4686,12 +4799,20 @@
+ void vtkKWMultiColumnList::InvokeCellUpdatedCommand(
+ int row, int col, const char *text)
+ {
++ vtksys_stl::string cell_contents(text);
+ if (this->CellUpdatedCommand && *this->CellUpdatedCommand &&
+ this->IsCreated())
+ {
+ this->Script("%s %d %d {%s}",
+- this->CellUpdatedCommand, row, col, text);
++ this->CellUpdatedCommand, row, col, cell_contents.c_str());
+ }
++
++ void* data[3];
++ data[0] = &row;
++ data[1] = &col;
++ data[2] = (void*)(cell_contents.c_str());
++
++ this->InvokeEvent(vtkKWMultiColumnList::CellUpdatedEvent, data);
+ }
+
+ //----------------------------------------------------------------------------
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWMultiColumnList.h kwwidgets-1.0.0~cvs20080526/vtkKWMultiColumnList.h
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWMultiColumnList.h 2008-04-16 00:41:13.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWMultiColumnList.h 2008-10-26 11:34:44.000000000 +0100
+@@ -42,6 +42,7 @@
+ class vtkKWCheckButton;
+ class vtkKWComboBox;
+ class vtkKWFrame;
++class vtkKWLoadSaveButton;
+ class vtkStringArray;
+
+ class KWWidgets_EXPORT vtkKWMultiColumnList : public vtkKWCoreWidget
+@@ -819,6 +820,11 @@
+ // the cell is updated automatically (to 0 or 1). Note that the
+ // EditEndCommand and CellUpdatedCommand are handled the same way.
+ // Check the SetCellWindowCommand method for more information.
++ // Important: note that you can not set the Command for this checkbutton
++ // (doing so will prevent CellUpdatedCommand from being called for example
++ // or the cell contents to be updated). Also note that a new checkbutton
++ // instance will be created each time you sort its column (by design of
++ // the third-party tablelist Tk widget used under the hood).
+ virtual void SetCellWindowCommandToCheckButton(int row_index, int col_index);
+ virtual vtkKWCheckButton *GetCellWindowAsCheckButton(
+ int row_index, int col_index);
+@@ -868,6 +874,16 @@
+ virtual void SetUseBalloonHelpStringInCellColorButton(int);
+
+ // Description:
++ // The SetCellWindowCommandToPickDirectoryButton is a convenience method
++ // to automatically display a LoadSaveButton with ChooseDirectoryOn
++ // in the cell. The selected directory of the button is interpreted
++ // directly from the text in the cell, as set by SetCellText for example.
++ virtual void SetCellWindowCommandToPickDirectoryButton(
++ int row_index, int col_index);
++ virtual vtkKWLoadSaveButton* GetCellWindowAsPickDirectoryButton(
++ int row_index, int col_index);
++
++ // Description:
+ // Specifies a command to be invoked when the window embedded into the cell
+ // located at (row_index, col_index) is destroyed. It is automatically
+ // concatenated the same parameter as the SetCellWindowCommand method that
+@@ -1348,11 +1364,20 @@
+ // Description:
+ // Events. The SelectionChangedEvent is triggered when the selection is
+ // changed (see SetSelectionCommand for more details).
++ // The CellUpdatedEvent is triggered whenever a cell is updated, i.e.
++ // when InvokeCellUpdatedCommand is called. The following parameters are
++ // also passed as client data for CellUpdatedEvent:
++ // - the cell location, i.e. its row and column indices: int, int
++ // - the cell's new contents: const char*
++ // Note that given the heterogeneous nature of types passed as client data,
++ // you should treat it as an array of void*[3], each one a pointer to
++ // the parameter (i.e., &int, &int, &const char*).
+ //BTX
+ enum
+ {
+ SelectionChangedEvent = 10000,
+- NumberOfRowsChangedEvent
++ NumberOfRowsChangedEvent,
++ CellUpdatedEvent
+ };
+ //ETX
+
+@@ -1377,6 +1402,10 @@
+ vtkKWWidget*, int, int, const char *);
+ virtual void CellWindowCommandToColorButtonCallback(
+ const char*, int, int, const char*);
++ virtual void CellWindowCommandToPickDirectoryButtonCallback(
++ const char*, int, int, const char*);
++ virtual void CellWindowCommandToPickDirectoryButtonChangeCallback(
++ vtkKWWidget*, int, int);
+ virtual void ColumnSortedCallback();
+ virtual void ColumnMovedCallback();
+ virtual void RowMovedCallback();
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWTkUtilities.cxx kwwidgets-1.0.0~cvs20080526/vtkKWTkUtilities.cxx
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWTkUtilities.cxx 2008-04-16 17:17:35.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWTkUtilities.cxx 2008-10-26 11:34:44.000000000 +0100
+@@ -46,7 +46,7 @@
+
+ //----------------------------------------------------------------------------
+ vtkStandardNewMacro(vtkKWTkUtilities);
+-vtkCxxRevisionMacro(vtkKWTkUtilities, "$Revision: 1.93 $");
++vtkCxxRevisionMacro(vtkKWTkUtilities, "$Revision: 1.93.2.1 $");
+
+ //----------------------------------------------------------------------------
+ const char* vtkKWTkUtilities::GetTclNameFromPointer(
+@@ -567,6 +567,7 @@
+ }
+ dlg->SetTitle(dialog_title);
+ dlg->SetDisplayPositionToPointer();
++ dlg->GetColorPickerWidget()->SetCurrentColorAsRGB(in_r, in_g, in_b);
+ dlg->GetColorPickerWidget()->SetNewColorAsRGB(in_r, in_g, in_b);
+ if (dlg->Invoke())
+ {
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWTopLevel.cxx kwwidgets-1.0.0~cvs20080526/vtkKWTopLevel.cxx
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWTopLevel.cxx 2008-02-07 16:51:06.000000000 +0100
++++ kwwidgets-1.0.0~cvs20080526/vtkKWTopLevel.cxx 2008-10-26 11:34:44.000000000 +0100
+@@ -24,7 +24,7 @@
+
+ //----------------------------------------------------------------------------
+ vtkStandardNewMacro( vtkKWTopLevel );
+-vtkCxxRevisionMacro(vtkKWTopLevel, "$Revision: 1.33 $");
++vtkCxxRevisionMacro(vtkKWTopLevel, "$Revision: 1.33.2.1 $");
+
+ //----------------------------------------------------------------------------
+ vtkKWTopLevel::vtkKWTopLevel()
+@@ -88,7 +88,7 @@
+ opts += "} ";
+ }
+ }
+- opts += " -visual best -highlightthickness 0";
++ opts += " -highlightthickness 0";
+
+ // Call the superclass to set the appropriate flags then create manually
+
+diff -urNad kwwidgets-1.0.0~cvs20080526~/vtkKWUserInterfaceManagerDialog.cxx kwwidgets-1.0.0~cvs20080526/vtkKWUserInterfaceManagerDialog.cxx
+--- kwwidgets-1.0.0~cvs20080526~/vtkKWUserInterfaceManagerDialog.cxx 2008-05-25 01:15:14.000000000 +0200
++++ kwwidgets-1.0.0~cvs20080526/vtkKWUserInterfaceManagerDialog.cxx 2008-10-26 11:34:44.000000000 +0100
+@@ -37,7 +37,7 @@
+
+ //----------------------------------------------------------------------------
+ vtkStandardNewMacro(vtkKWUserInterfaceManagerDialog);
+-vtkCxxRevisionMacro(vtkKWUserInterfaceManagerDialog, "$Revision: 1.20 $");
++vtkCxxRevisionMacro(vtkKWUserInterfaceManagerDialog, "$Revision: 1.21 $");
+
+ //----------------------------------------------------------------------------
+ class vtkKWUserInterfaceManagerDialogInternals
+@@ -142,7 +142,7 @@
+ this->TopLevel->SetApplication(this->GetApplication());
+ this->TopLevel->Create();
+ this->TopLevel->ModalOff();
+- this->TopLevel->SetSize(640, 450);
++ this->TopLevel->SetSize(700, 500);
+ this->TopLevel->SetMinimumSize(640, 450);
+
+ vtkKWWidget *parent = this->TopLevel;
Propchange: packages/kwwidgets/trunk/debian/patches/05_slicer-3-2.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/kwwidgets/trunk/debian/patches/12_path.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/12_path.dpatch?rev=35280&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/12_path.dpatch (original)
+++ packages/kwwidgets/trunk/debian/patches/12_path.dpatch Sun Oct 26 11:14:45 2008
@@ -5,9 +5,9 @@
## DP: Install libraries to /usr/lib/
@DPATCH@
-diff -urNad kwwidgets-1.0.0~/CMakeLists.txt kwwidgets-1.0.0/CMakeLists.txt
---- kwwidgets-1.0.0~/CMakeLists.txt 2008-07-01 20:43:48.000000000 +0200
-+++ kwwidgets-1.0.0/CMakeLists.txt 2008-09-04 23:01:10.000000000 +0200
+diff -urNad kwwidgets-1.0.0~cvs20080526~/CMakeLists.txt kwwidgets-1.0.0~cvs20080526/CMakeLists.txt
+--- kwwidgets-1.0.0~cvs20080526~/CMakeLists.txt 2008-10-26 11:41:11.000000000 +0100
++++ kwwidgets-1.0.0~cvs20080526/CMakeLists.txt 2008-10-26 11:41:12.000000000 +0100
@@ -107,7 +107,7 @@
endif(NOT KWWidgets_INSTALL_BIN_DIR)
@@ -24,5 +24,5 @@
- set(KWWidgets_INSTALL_PACKAGE_DIR ${KWWidgets_INSTALL_LIB_DIR}
+ set(KWWidgets_INSTALL_PACKAGE_DIR "/lib/${PROJECT_NAME}"
CACHE INTERNAL "")
- endif(NOT KWWidgets_INSTALL_PACKAGE_DIR)
-
+ install_targets(
+ ${KWWidgets_INSTALL_LIB_DIR}
Modified: packages/kwwidgets/trunk/debian/patches/35_tcl.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/35_tcl.dpatch?rev=35280&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/35_tcl.dpatch (original)
+++ packages/kwwidgets/trunk/debian/patches/35_tcl.dpatch Sun Oct 26 11:14:45 2008
@@ -5,9 +5,9 @@
## DP: Chane tcl path
@DPATCH@
-diff -urNad kwwidgets-1.0.0~/Wrapping/Tcl/CMakeLists.txt kwwidgets-1.0.0/Wrapping/Tcl/CMakeLists.txt
---- kwwidgets-1.0.0~/Wrapping/Tcl/CMakeLists.txt 2008-04-30 17:23:40.000000000 +0200
-+++ kwwidgets-1.0.0/Wrapping/Tcl/CMakeLists.txt 2008-09-04 23:49:37.000000000 +0200
+diff -urNad kwwidgets-1.0.0~cvs20080526~/Wrapping/Tcl/CMakeLists.txt kwwidgets-1.0.0~cvs20080526/Wrapping/Tcl/CMakeLists.txt
+--- kwwidgets-1.0.0~cvs20080526~/Wrapping/Tcl/CMakeLists.txt 2008-10-26 11:41:04.000000000 +0100
++++ kwwidgets-1.0.0~cvs20080526/Wrapping/Tcl/CMakeLists.txt 2008-10-26 11:41:23.000000000 +0100
@@ -47,7 +47,7 @@
${KWWidgets_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
@ONLY IMMEDIATE)
Modified: packages/kwwidgets/trunk/debian/patches/66_soname.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/66_soname.dpatch?rev=35280&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/66_soname.dpatch (original)
+++ packages/kwwidgets/trunk/debian/patches/66_soname.dpatch Sun Oct 26 11:14:45 2008
@@ -5,10 +5,10 @@
## DP: Sets the SONAME
@DPATCH@
-diff -urNad kwwidgets-1.0.0~/CMakeLists.txt kwwidgets-1.0.0/CMakeLists.txt
---- kwwidgets-1.0.0~/CMakeLists.txt 2008-09-04 23:14:37.000000000 +0200
-+++ kwwidgets-1.0.0/CMakeLists.txt 2008-09-04 23:15:37.000000000 +0200
-@@ -865,3 +865,17 @@
+diff -urNad kwwidgets-1.0.0~cvs20080526~/CMakeLists.txt kwwidgets-1.0.0~cvs20080526/CMakeLists.txt
+--- kwwidgets-1.0.0~cvs20080526~/CMakeLists.txt 2008-10-26 11:41:36.000000000 +0100
++++ kwwidgets-1.0.0~cvs20080526/CMakeLists.txt 2008-10-26 11:41:37.000000000 +0100
+@@ -869,3 +869,17 @@
if(KWWidgets_NEED_TO_BUILD_EXAMPLES)
subdirs(Examples)
endif(KWWidgets_NEED_TO_BUILD_EXAMPLES)
Modified: packages/kwwidgets/trunk/debian/patches/77_doxygen.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/77_doxygen.dpatch?rev=35280&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/77_doxygen.dpatch (original)
+++ packages/kwwidgets/trunk/debian/patches/77_doxygen.dpatch Sun Oct 26 11:14:45 2008
@@ -5,9 +5,9 @@
## DP: source directory added
@DPATCH@
-diff -urNad kwwidgets-1.0.0~/Utilities/Doxygen/doxyfile.in kwwidgets-1.0.0/Utilities/Doxygen/doxyfile.in
---- kwwidgets-1.0.0~/Utilities/Doxygen/doxyfile.in 2006-10-20 16:24:45.000000000 +0200
-+++ kwwidgets-1.0.0/Utilities/Doxygen/doxyfile.in 2008-09-13 13:43:56.000000000 +0200
+diff -urNad kwwidgets-1.0.0~cvs20080526~/Utilities/Doxygen/doxyfile.in kwwidgets-1.0.0~cvs20080526/Utilities/Doxygen/doxyfile.in
+--- kwwidgets-1.0.0~cvs20080526~/Utilities/Doxygen/doxyfile.in 2008-10-26 11:41:04.000000000 +0100
++++ kwwidgets-1.0.0~cvs20080526/Utilities/Doxygen/doxyfile.in 2008-10-26 11:41:44.000000000 +0100
@@ -42,6 +42,7 @@
INPUT = \
More information about the debian-science-commits
mailing list