62 Commits

Author SHA1 Message Date
Paolo Cignoni cignoni
ccbe67eeca -changed folders\files organizations. Added Common folder to contain files used by both projects
-many minor changed due to update of incude file paths

- changed representation of brightness level value in csv files
- fixed bug in apply method of filter

-other minor changes
2008-02-20 17:23:00 +00:00
Paolo Cignoni cignoni
4feb996461 Refactoring of method necessary ti FilterQualityMapper 2008-02-20 14:53:03 +00:00
Paolo Cignoni cignoni
4a90c86b1b fixed bug about axis draw in equalizer histogram 2008-02-19 16:03:46 +00:00
Paolo Cignoni cignoni
2fe1c33b91 - Connected handles to x-quality
- Added warning for no-quality meshes
- Removed histogram.h from project
2008-02-18 22:35:20 +00:00
Paolo Cignoni cignoni
33208094e6 qualitymapperdialog.h\cpp:
- updated load csv file method and added method to set default\user defined values for equalizer
2008-02-18 17:11:35 +00:00
Paolo Cignoni cignoni
28d0f17ad9 edit_quality.pro
- removed reference to filterparameter.cpp file (never used)

qualitymapperdialog.cpp:
- added call to preview callback in some points

filter_quality.pro:
- just added to CVS
2008-02-18 16:14:38 +00:00
Paolo Cignoni cignoni
29a27053cd qualitymapperdialog.cpp \ util.cpp:
- updated updateXQualityLabel and relative2QualityValf methods
- added call to updateXQualityLabel at xSpinbox value change
2008-02-18 14:49:14 +00:00
Paolo Cignoni cignoni
d03e5f019a const_types.h:
- added definition of EQUALIZER_INFO struct

util.h:
- some minor changes

transferfunction.h\cpp:
- extended saveColorBand (now the method takes as input an EQUALIZER_INFO struct and saves on output file equalzer informations too)

qualitymapperdialog.h\cpp:
- updated callback method for save of current TF (added equalizer info)
- updated callback methos for load of TF (stub yet)
- added definition and call to method that shows the current x-mapped quality of currently selected TF handle
2008-02-17 19:16:07 +00:00
Paolo Cignoni cignoni
7ffba43963 - Corrected bug in equalizer handles/spinboxes
- implemented "reset histogram" button
2008-02-17 17:20:35 +00:00
Paolo Cignoni cignoni
c5774254ed qualitymapper.cpp:
- fixed stack-overflow bug in endEdit method (qualitymapper) (added disconnect qualitymapperialgog before calling its destructor)
- other minor changes

qualitymapperdialog.cpp:
- fixed bug in clearItem about EqHandles remove and destroy.
- other minor changes
2008-02-17 12:08:31 +00:00
Paolo Cignoni cignoni
de785c4760 transferfunction.h\cpp:
- removed junction point field from TF_KEY struct-
- minor changes to adapt to the change above

qualitymapperdialog.h\cpp:
- added call to endEdit method when dialog is closed
- added TFHandle creation by doubleclick on empty areas (using invisible graphics item)
- other minor changes

util.cpp:
- minor change
2008-02-15 18:46:19 +00:00
Paolo Cignoni cignoni
af460a9358 - Avoided unnecessary redraw in equalizerhistogram 2008-02-15 12:11:29 +00:00
Paolo Cignoni cignoni
b98be4794e qualitymapper.ui:
- removed ADD and REMOVE handle buttons. Replaced with xQualityPosition label (just graphics change, not implemented yet)

qualitymapper.h\cpp\ui:
- added mouseDoubleClickevent callback to manage double click for QualityMapperDialog. Everything compiles, but callback doesn't work. Suspect bubbling instead of tunneling. If so, other simpler solutions needed
2008-02-14 16:15:49 +00:00
Paolo Cignoni cignoni
b533b4202e initial signal to enable trackball 2008-02-13 15:34:50 +00:00
Paolo Cignoni cignoni
4959f5761a fixed minor bug about border TfHandles move 2008-02-13 12:22:07 +00:00
Paolo Cignoni cignoni
dfabb80358 transferfunction.h\cpp:
- updated isHead and isTail methods for TfChannel class

qualitymappredialog.h\cpp:
- enhanced TfHandle move management
- fixed bug about crash when moving border TfHandles and changed newTfHandle creation policy
- some other minor changes
2008-02-13 10:44:15 +00:00
Paolo Cignoni cignoni
b45054cdb9 - Added equalizer histogram stretching when eqhandles are dragged outside the chart
- Separed eqhandles creation and connection from equalizer histogram drawing
2008-02-12 23:57:59 +00:00
Paolo Cignoni cignoni
d7263297f5 i declaration out of for if you want to use it outside... 2008-02-12 20:25:44 +00:00
Paolo Cignoni cignoni
baf73a7702 tfhandle.h\cpp:
- added method to manage double click on TfHandle. When user double-clicks on TfHandle, it's deleted
- other minor changes

transferfunction.h\cpp:
.- modified an overloaded version of removeKey method (TfChannel)
- added flag methods to know if a certain key is the head (its x=0) or the tail (x=1) of the key list (TfChannel)
- other minor changes

qualitympperdialog.h\cpp\ui:
- added callback methods and support to add and remove TfHandles from TF (by mouse or by gui buttons)
2008-02-11 19:25:42 +00:00
Paolo Cignoni cignoni
cc1813fab1 now the currently selected TfHandle is drawn in different way and is visible to the user 2008-02-09 18:35:44 +00:00
Paolo Cignoni cignoni
a56d55418b main change: FIXED BUG ABOUT TFHANDLES REPRESENTATION WHEN THY'RE DRAGGED BY USER!! :-)
transferfunction.h\cpp:
- added updateKeysOrder method to TfChannel to restore the correct order among TF_KEYs when one of them is changed (they've to be sorted by x value)

tfhandle.h\cpp:
- now the TfHandle gets a reference to the joined TF_KEY
- updated constructor definition
- updated methods to get its relative position in the scene
- updated method to refresh the correct state of keys in the channel belonging to TfHandle
- other minor changes

qualitymapperdialog.h\cpp:
- minor changes to align itself to above changes (main change: updated method to keep order among TfHandles)
- fixed a couple of bugs about loading and saving external CSV (TF) files
- other minor changes and updates (some optimizations and comments added)
2008-02-09 17:32:56 +00:00
Paolo Cignoni cignoni
f7427367bd Updated gammaCorrection painting 2008-02-09 13:42:06 +00:00
Paolo Cignoni cignoni
d0624e8e91 qualitymapperdialog.h\cpp\ui - tfhandle.h\cpp - transferfunction.cpp:
- some changes to spinboxes representing the coords of the current selected point of the transfer function
- added methods to change TF from spinboxes and viceversa
- other minor changes
2008-02-08 21:08:22 +00:00
Paolo Cignoni cignoni
2ea7f9008c qulitymapperdialog.h\cpp:
- fixed a crashing bug about TF file save in a prticular case
- updated methods to manage the TFHandles movements
- changed the type of TfHanldes container
- other minor changes

TfHandles.h\cpp:
- updated method to manage the TFHandles movements
- some other minor changes

transferfunction.h\cpp:
- updated method to manage the TFHandles movements
- some other minor changes
2008-02-08 12:15:57 +00:00
Paolo Cignoni cignoni
e82c406fd8 - Implemented preview button
- Converted QDialog in QDockWidget
- Added slider for color brightness
2008-02-08 12:04:09 +00:00
Paolo Cignoni cignoni
d75dfe7cf4 small changes done during the meeting 2008-02-06 11:28:10 +00:00
Paolo Cignoni cignoni
b9e35f4073 qualitymapperdialog.h\cpp:
- updated drawTransferFunction method (now very faster)
- updated moveChannelAhead method (stub yet)
- fixed other minor bugs

tfhandle.h\cpp:
- added pointer to TF_KEY managed by itself
- updated onMouseMove behaviour (now it modifies the values contained in its TF_KEY)
- other minor changes

transferfunction.h\cpp:
- minor changes
2008-02-06 00:41:13 +00:00
Paolo Cignoni cignoni
37747afb1f - modified on_applyButton_clicked()
- added on_previewButton_clicked() - it just calls on_applyButton_clicked()
2008-02-05 19:31:17 +00:00
Paolo Cignoni cignoni
5e00116a36 const_types.h:
- some minor changes

handle.h\cpp:
- added size method

tfhandle.h\cpp:
- updated paint method
- some other minor changes

transferfunction.h\cpp:
- changed base struct from STL map to STL vector.
- changed internal structure and behavior of TF_KEY
- removed some old methods (used for map)
- changed some methods
- some other minor changes

qualitymapperdialog.h\cpp:
- applied changes to use the new keys management
- updated drawTransferFunction method (stub yet)
2008-02-05 10:10:46 +00:00
Paolo Cignoni cignoni
6649d6419b Added stub method for apply button 2008-02-05 09:42:27 +00:00
Paolo Cignoni cignoni
1f0f6b3d65 Separeted TFhandles drawing from TFBG one 2008-02-04 16:52:12 +00:00
Paolo Cignoni cignoni
c9c41bab26 Correction (previous version was corrupted) 2008-02-03 17:04:09 +00:00
Paolo Cignoni cignoni
cb32d41243 moved connections from constructor to drawEqualizerHistogram 2008-02-03 16:45:58 +00:00
Paolo Cignoni cignoni
321470e2c6 - QMD: Modified EqHandle handles[] in EqHandle* handles[]
- EQH: Modified EqHandle contructor
2008-02-03 16:17:39 +00:00
Paolo Cignoni cignoni
f90639d709 qualitymapperdialog.h\cpp:
- added the collection of data reguarding the TF's BG bars. Now the redraw of the BG works fine
- fixed bug about histogram bars position. Now they are positioned in Z=-1 (both the top and bottom ones)
2008-02-02 17:48:14 +00:00
Paolo Cignoni cignoni
d268a7e8b8 const_types.h:
- added new macro to denote the desplacement of all TF's items (lines, handles and bg)

qualitymapperdialog.cpp:
- added calls to clearItems before the building a new TF to collect old data
- fixed bug about Tf lines storing (now working properly)
2008-02-02 16:56:22 +00:00
Paolo Cignoni cignoni
37e4fed3b6 const_types.h:
- added some constants used for data collection

handle.h\cpp:
- moved in this class the reference to chart info struct
- some other minor changes

eqhandle.h\cpp:
- some minor changes

tfhandles.h\cpp:
- added some basic management methods
- added mouse movement callback (stub)

qualitymapperdialog.h\cpp:
- changed Graphics Items' management for TF drawing. Now the items are stored per-group in some containers, attached and detached from the scene when necessary (still stub)
- added clearItems method and updated clearScene method for efficient generic memory management
- added management of TfHandle move (still stub)
- some other minor changes and updates

transferfunction.h\cpp:
- changed internal TfChannel representation of KEY_LIST. Now, each entry contains a key and a x-value and a pointer to a TF_KEY struct (before there was a value storing). (performance boost expected)
2008-02-02 15:23:46 +00:00
Paolo Cignoni cignoni
f0755e4448 Added Gamma Correction and colorBand drawing 2008-02-02 13:49:07 +00:00
Paolo Cignoni cignoni
1230399b70 Added partial histogram visualization in transferFunctionView 2008-01-29 18:42:08 +00:00
Paolo Cignoni cignoni
8b455659ed Solved bug in equalizer handles 2008-01-29 11:43:15 +00:00
Paolo Cignoni cignoni
b20ed530c4 qualitymapper.qrc:
- added reference to image opentf.png

qualitymapperdialog.h\cpp\ui:
- added method to clear the current scene before drawing
- updated drawChartBasics method to manage Z oerde of items drawn.
- updated drawTransferFuntion method to manage Z order of items drawn.
- added callback methods to manage farward channel view (channel radio buttons). Now, when a channel is selected, the Transfer Function draws the channels in the correct order.
- updated callback method invoked when the text of the TF comboBox changes and fixed some bugs.
- updated callback methods to manage the default-TF and file loading of transfer functions.
- updated callback mehod to save the current Transfer Function in a CSV file.
- added icon to load Transfer Function button
- other minor changes and updates.

transferfunction.h\cpp:
- added some macros to manage CSV files generation considering current operative system.
- defined startup transfer function type (macro).
- updated overloaded constuctor (with CSV file parameter), for TF generation starting from CSV file.
- updated moveChannelAhead method to manage channels order while drawing.
- other minor changes.
2008-01-28 21:58:08 +00:00
Paolo Cignoni cignoni
322a50a4c5 Equalizer handles fully working 2008-01-28 14:29:57 +00:00
Paolo Cignoni cignoni
7afbe9199b qualitymapperdialog.h\cpp:
- added KNOWN_EXTERNAL_TFS struct to manage references to from-file TFs in the presetComboBox list
- added method to clear the scene before drawing (if necessary)
- implemented behavior for ComboBox selection change
- updated save and load actions for presetComboBox

qualitymapperdialog.ui:
- some minor changes

transferfunction.cpp:
- minor changes
2008-01-26 19:30:27 +00:00
Paolo Cignoni cignoni
b17ffda13a qualitymapper.h\cpp:
- removed Histogram and TransferFunction member objects

qualitymapperdialog.h\cpp:
- added Histogram and TransferFunction member objects
- added method for load of TF\CSV file
- other minor changes

qualitymapperdialog.ui:
- added button to load a CSV\TF file from disk

transferfunction.h\cpp:
- overloaded constructor for TF generation from CSV file
- added and implemented generation of TF from default colorband (GREY SCALE, RGB, RED SCALE, GREEN SCALE, BLUE SCALE, FLAT)
- implemented method for managing channels painting order

util.h
- updated internal structure of CHART_INFO
2008-01-25 17:35:50 +00:00
Paolo Cignoni cignoni
b0eff4c6bb Improved handles connections (not working) 2008-01-25 12:13:26 +00:00
Paolo Cignoni cignoni
386c55f3f3 transferfunction.h\cpp:
- implemented saveColorBand method (stub yet)

qualitymapperdialog.cpp:
minor changes
2008-01-24 17:40:26 +00:00
Paolo Cignoni cignoni
d586afbc89 Improved handles and spinboxes connections in equalizer histogram 2008-01-24 15:49:22 +00:00
Paolo Cignoni cignoni
1103ce3b23 qualityapperdialog.h\cpp
- added callback methods to manage the save of a TransferFunction file

qualitymapperdialog.ui:
- minor changes

transferfunction.h\cpp:
- added methods to split a single channel key in two
- added method to save a CSV file representing the current Transfer Function

util.h:
- moved here CHART_INFO struct definition
2008-01-24 11:03:04 +00:00
Paolo Cignoni cignoni
81e68ddc61 Modified handle design (added vertical bar)
CHART_INFO transfert in util.h
2008-01-23 19:05:35 +00:00
Paolo Cignoni cignoni
ff88f13995 const_types.h:
updated some constants

EqHandle.h\cpp:
- minor changes

qualitymapperdialog.h\cpp:
- updated drawChartsBasics signature and implementation
- updated drawTransferFunction method (now working)
- fixed bug in drawEqualizerHistogram: now the hadles are drawn correctly

qualitymapperdialog.ui:
- minor changes

transferfunction.h\cpp:
- fixed bug in random keys generation method (uesd for test)
- removed enumeration to index lower\upper y values for a key. 3 defines have been used.
- other minor changes
2008-01-23 16:15:43 +00:00