Ignore:
Timestamp:
Jun 11, 2012, 9:53:19 AM (14 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, Candidate_v1.7.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
95f965
Parents:
b9c69d
git-author:
Michael Ankele <ankele@…> (04/24/12 13:55:16)
git-committer:
Frederik Heber <heber@…> (06/11/12 09:53:19)
Message:

disastrously big and ugly commit

  • using new Parameter<T> classes:
    • Actions
    • Queries (all UIs)
  • TODO:
    • actions crash cause Value is unset
    • no query<BoxVector>
Location:
src/UIElements/Qt4/Pipe
Files:
34 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/Qt4/Pipe/AtomQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2828
    2929
    30 AtomQtQueryPipe::AtomQtQueryPipe(const atom **_content, QtDialog *_dialog, QComboBox *_theBox) :
     30AtomQtQueryPipe::AtomQtQueryPipe(Parameter<const atom *> &_content, QtDialog *_dialog, QComboBox *_theBox) :
    3131  content(_content),
    3232  dialog(_dialog),
    … …  
    4040  QVariant data = theBox->itemData(newIndex);
    4141  int idx = data.toInt();
    42   (*content) = World::getInstance().getAtom(AtomById(idx));
     42  content.set(World::getInstance().getAtom(AtomById(idx)));
    4343  dialog->update();
    4444}

  • src/UIElements/Qt4/Pipe/AtomQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2526  Q_OBJECT
    2627public:
    27   AtomQtQueryPipe(const atom **_content, QtDialog *_dialog, QComboBox *_theBox);
     28  AtomQtQueryPipe(Parameter<const atom *> &_content, QtDialog *_dialog, QComboBox *_theBox);
    2829  virtual ~AtomQtQueryPipe();
    2930
    … …  
    3233
    3334private:
    34   const atom **content;
     35  Parameter<const atom *> &content;
    3536  QtDialog *dialog;
    3637  QComboBox *theBox;

  • src/UIElements/Qt4/Pipe/AtomsQtQueryPipe.cpp

    rb9c69d rf10b0c  
    3030
    3131
    32 AtomsQtQueryPipe::AtomsQtQueryPipe(std::vector<const atom *>*_content, QtDialog *_dialog, QListWidget *_theList) :
     32AtomsQtQueryPipe::AtomsQtQueryPipe(Parameter<std::vector<const atom *> > &_content, QtDialog *_dialog, QListWidget *_theList) :
    3333  content(_content),
    3434  dialog(_dialog),
    … …  
    4141void AtomsQtQueryPipe::update() {
    4242  // clear target and put all atoms therein
    43   (*content).clear();
     43  std::vector<const atom *> temp_atoms;
    4444  for (std::set<const atom *>::iterator iter = currentList.begin(); iter != currentList.end(); ++iter)
    45     (*content).push_back(*iter);
     45    temp_atoms.push_back(*iter);
     46  content.set(temp_atoms);
    4647  dialog->update();
    4748}
    … …  
    5354    atom *Walker = World::getInstance().getAtom(AtomById(index));
    5455    if (Walker) {
    55       (*content).push_back(Walker);
    5656      currentList.insert(Walker);
    5757      if (lookup.find(index) != lookup.end())

  • src/UIElements/Qt4/Pipe/AtomsQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2930  Q_OBJECT
    3031public:
    31   AtomsQtQueryPipe(std::vector<const atom *>*_content, QtDialog *_dialog, QListWidget *_theList);
     32  AtomsQtQueryPipe(Parameter<std::vector<const atom *> > &_content, QtDialog *_dialog, QListWidget *_theList);
    3233  virtual ~AtomsQtQueryPipe();
    3334
    … …  
    3839
    3940private:
    40   std::vector<const atom *>*content;
     41  Parameter<std::vector<const atom *> > &content;
    4142  std::map<int, const atom *> lookup;
    4243  std::set<const atom *> currentList;

  • src/UIElements/Qt4/Pipe/BooleanQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2525#include "CodePatterns/MemDebug.hpp"
    2626
    27 BooleanQtQueryPipe::BooleanQtQueryPipe(bool *_content, QtDialog *_dialog, QCheckBox *_booleanCheckBox) :
     27BooleanQtQueryPipe::BooleanQtQueryPipe(Parameter<bool> &_content, QtDialog *_dialog, QCheckBox *_booleanCheckBox) :
    2828  content(_content),
    2929  dialog(_dialog),
    … …  
    3535
    3636void BooleanQtQueryPipe::update(int state) {
    37   (*content) = (state == Qt::Checked);
     37  content.set(state == Qt::Checked);
    3838  dialog->update();
    3939}

  • src/UIElements/Qt4/Pipe/BooleanQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2324  Q_OBJECT
    2425public:
    25   BooleanQtQueryPipe(bool *_content, QtDialog *_dialog, QCheckBox *_booleanCheckBox);
     26  BooleanQtQueryPipe(Parameter<bool> &_content, QtDialog *_dialog, QCheckBox *_booleanCheckBox);
    2627  virtual ~BooleanQtQueryPipe();
    2728
    … …  
    3031
    3132private:
    32   bool *content;
     33  Parameter<bool> &content;
    3334  QtDialog *dialog;
    3435  QCheckBox *booleanCheckBox;

  • src/UIElements/Qt4/Pipe/BoxQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2828#include "Box.hpp"
    2929
    30 BoxQtQueryPipe::BoxQtQueryPipe(Box &_content, QtDialog *_dialog, QTableWidget *_inputTable) :
     30BoxQtQueryPipe::BoxQtQueryPipe(Parameter<Box> &_content, QtDialog *_dialog, QTableWidget *_inputTable) :
    3131  content(_content),
    3232  dialog(_dialog),
    … …  
    4545{
    4646  tmpM->at(row, column) = inputTable->item(row, column)->text().toDouble();
    47   content.setM(*tmpM);
     47  Box b;
     48  b.setM(*tmpM);
     49  content.set(b);
    4850  dialog->update();
    4951}

  • src/UIElements/Qt4/Pipe/BoxQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2728  Q_OBJECT
    2829public:
    29   BoxQtQueryPipe(Box &_content, QtDialog *_dialog, QTableWidget *_inputTable);
     30  BoxQtQueryPipe(Parameter<Box> &_content, QtDialog *_dialog, QTableWidget *_inputTable);
    3031  virtual ~BoxQtQueryPipe();
    3132
    … …  
    3435
    3536private:
    36   Box &content;
     37  Parameter<Box> &content;
    3738  QtDialog *dialog;
    3839  QTableWidget *inputTable;

  • src/UIElements/Qt4/Pipe/DoubleQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2323#include "CodePatterns/MemDebug.hpp"
    2424
    25 DoubleQtQueryPipe::DoubleQtQueryPipe(double *_content, QtDialog *_dialog) :
     25DoubleQtQueryPipe::DoubleQtQueryPipe(Parameter<double> &_content, QtDialog *_dialog) :
    2626  content(_content),
    2727  dialog(_dialog)
    … …  
    3232
    3333void DoubleQtQueryPipe::update(double newDbl) {
    34   (*content) = newDbl;
     34  content.set(newDbl);
    3535  dialog->update();
    3636}

  • src/UIElements/Qt4/Pipe/DoubleQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2223  Q_OBJECT
    2324public:
    24   DoubleQtQueryPipe(double *_content, QtDialog *_dialog);
     25  DoubleQtQueryPipe(Parameter<double> &_content, QtDialog *_dialog);
    2526  virtual ~DoubleQtQueryPipe();
    2627
    … …  
    2930
    3031private:
    31   double *content;
     32  Parameter<double> &content;
    3233  QtDialog *dialog;
    3334

  • src/UIElements/Qt4/Pipe/ElementQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2929
    3030
    31 ElementQtQueryPipe::ElementQtQueryPipe(const element **_content, QtDialog *_dialog, QComboBox *_theBox) :
     31ElementQtQueryPipe::ElementQtQueryPipe(Parameter<const element *> &_content, QtDialog *_dialog, QComboBox *_theBox) :
    3232  content(_content),
    3333  dialog(_dialog),
    … …  
    4141  QVariant data = theBox->itemData(newIndex);
    4242  int idx = data.toInt();
    43   *content = World::getInstance().getPeriode()->FindElement(idx);
     43  content.set(World::getInstance().getPeriode()->FindElement(idx));
    4444  dialog->update();
    4545}

  • src/UIElements/Qt4/Pipe/ElementQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2526  Q_OBJECT
    2627public:
    27   ElementQtQueryPipe(const element **_content, QtDialog *_dialog, QComboBox *_theBox);
     28  ElementQtQueryPipe(Parameter<const element *> &_content, QtDialog *_dialog, QComboBox *_theBox);
    2829  virtual ~ElementQtQueryPipe();
    2930
    … …  
    3233
    3334private:
    34   const element **content;
     35  Parameter<const element *> &content;
    3536  QtDialog *dialog;
    3637  QComboBox *theBox;

  • src/UIElements/Qt4/Pipe/ElementsQtQueryPipe.cpp

    rb9c69d rf10b0c  
    3131
    3232
    33 ElementsQtQueryPipe::ElementsQtQueryPipe(std::vector<const element *>*_content, QtDialog *_dialog, QComboBox *_theBox) :
     33ElementsQtQueryPipe::ElementsQtQueryPipe(Parameter<std::vector<const element *> > &_content, QtDialog *_dialog, QComboBox *_theBox) :
    3434  content(_content),
    3535  dialog(_dialog),
    … …  
    4444  int idx = data.toInt();
    4545  const element *elemental = World::getInstance().getPeriode()->FindElement(idx);
     46  std::vector<const element *> temp_elements;
    4647  if(elemental)
    47     (*content).push_back(elemental);
     48    temp_elements.push_back(elemental);
     49  content.set(temp_elements);
    4850  dialog->update();
    4951}

  • src/UIElements/Qt4/Pipe/ElementsQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2829  Q_OBJECT
    2930public:
    30   ElementsQtQueryPipe(std::vector<const element *>*_content, QtDialog *_dialog, QComboBox *_theBox);
     31  ElementsQtQueryPipe(Parameter<std::vector<const element *> > &_content, QtDialog *_dialog, QComboBox *_theBox);
    3132  virtual ~ElementsQtQueryPipe();
    3233
    … …  
    3536
    3637private:
    37   std::vector<const element *>*content;
     38  Parameter<std::vector<const element *> > &content;
    3839  QtDialog *dialog;
    3940  QComboBox *theBox;

  • src/UIElements/Qt4/Pipe/FileQtQueryPipe.cpp

    rb9c69d rf10b0c  
    3131#include "UIElements/Qt4/QtDialog.hpp"
    3232
    33 FileQtQueryPipe::FileQtQueryPipe(boost::filesystem::path *_content, QtDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton) :
     33FileQtQueryPipe::FileQtQueryPipe(Parameter<boost::filesystem::path> &_content, QtDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton) :
    3434  content(_content),
    3535  dialog(_dialog),
    … …  
    4949  QStringList ListOfFilenames = theFileDialog->selectedFiles();
    5050  std::cout << "Selected File is " << ListOfFilenames.at(0).toStdString() << std::endl;
    51   (*content) = ListOfFilenames.at(0).toStdString();
    52   filenameLineEdit->setText(QString::fromStdString((*content).string()));
     51  content.set(ListOfFilenames.at(0).toStdString());
     52  filenameLineEdit->setText(QString::fromStdString(content.get().string()));
    5353  dialog->update();
    5454}

  • src/UIElements/Qt4/Pipe/FileQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2728  Q_OBJECT
    2829public:
    29   FileQtQueryPipe(boost::filesystem::path *_content, QtDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton);
     30  FileQtQueryPipe(Parameter<boost::filesystem::path> &_content, QtDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton);
    3031  virtual ~FileQtQueryPipe();
    3132
    … …  
    3536
    3637private:
    37   boost::filesystem::path *content;
     38  Parameter<boost::filesystem::path> &content;
    3839  QtDialog *dialog;
    3940  QLineEdit *filenameLineEdit;

  • src/UIElements/Qt4/Pipe/IntQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2424
    2525
    26 IntQtQueryPipe::IntQtQueryPipe(int *_content, QtDialog *_dialog) :
     26IntQtQueryPipe::IntQtQueryPipe(Parameter<int> &_content, QtDialog *_dialog) :
    2727  content(_content),
    2828  dialog(_dialog)
    … …  
    3333
    3434void IntQtQueryPipe::update(int newInt) {
    35   (*content) = newInt;
     35  content.set(newInt);
    3636  dialog->update();
    3737}

  • src/UIElements/Qt4/Pipe/IntQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2223  Q_OBJECT
    2324public:
    24   IntQtQueryPipe(int *_content, QtDialog *_dialog);
     25  IntQtQueryPipe(Parameter<int> &_content, QtDialog *_dialog);
    2526  virtual ~IntQtQueryPipe();
    2627
    … …  
    2930
    3031private:
    31   int *content;
     32  Parameter<int> &content;
    3233  QtDialog *dialog;
    3334

  • src/UIElements/Qt4/Pipe/MoleculeQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2929
    3030
    31 MoleculeQtQueryPipe::MoleculeQtQueryPipe(const molecule **_content, QtDialog *_dialog, QComboBox *_theBox) :
     31MoleculeQtQueryPipe::MoleculeQtQueryPipe(Parameter<const molecule *> &_content, QtDialog *_dialog, QComboBox *_theBox) :
    3232  content(_content),
    3333  dialog(_dialog),
    … …  
    4141  QVariant data = theBox->itemData(newIndex);
    4242  int idx = data.toInt();
    43   (*content) = World::getInstance().getMolecule(MoleculeById(idx));
     43  content.set(World::getInstance().getMolecule(MoleculeById(idx)));
    4444  dialog->update();
    4545}

  • src/UIElements/Qt4/Pipe/MoleculeQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2526  Q_OBJECT
    2627public:
    27   MoleculeQtQueryPipe(const molecule **_content, QtDialog *_dialog, QComboBox *_theBox);
     28  MoleculeQtQueryPipe(Parameter<const molecule *> &_content, QtDialog *_dialog, QComboBox *_theBox);
    2829  virtual ~MoleculeQtQueryPipe();
    2930
    … …  
    3233
    3334private:
    34   const molecule **content;
     35  Parameter<const molecule *> &content;
    3536  QtDialog *dialog;
    3637  QComboBox *theBox;

  • src/UIElements/Qt4/Pipe/MoleculesQtQueryPipe.cpp

    rb9c69d rf10b0c  
    3131
    3232
    33 MoleculesQtQueryPipe::MoleculesQtQueryPipe(std::vector<const molecule *>*_content, QtDialog *_dialog, QComboBox *_theBox) :
     33MoleculesQtQueryPipe::MoleculesQtQueryPipe(Parameter<std::vector<const molecule *> > &_content, QtDialog *_dialog, QComboBox *_theBox) :
    3434  content(_content),
    3535  dialog(_dialog),
    … …  
    4444  int idx = data.toInt();
    4545  molecule *mol = World::getInstance().getMolecule(MoleculeById(idx));
     46  std::vector<const molecule *> temp_mols;
    4647  if (mol)
    47     (*content).push_back(mol);
     48    temp_mols.push_back(mol);
     49  content.set(temp_mols);
    4850  dialog->update();
    4951}

  • src/UIElements/Qt4/Pipe/MoleculesQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2728  Q_OBJECT
    2829public:
    29   MoleculesQtQueryPipe(std::vector<const molecule *>*_content, QtDialog *_dialog, QComboBox *_theBox);
     30  MoleculesQtQueryPipe(Parameter<std::vector<const molecule *> > &_content, QtDialog *_dialog, QComboBox *_theBox);
    3031  virtual ~MoleculesQtQueryPipe();
    3132
    … …  
    3435
    3536private:
    36   std::vector<const molecule *>*content;
     37  Parameter<std::vector<const molecule *> > &content;
    3738  QtDialog *dialog;
    3839  QComboBox *theBox;

  • src/UIElements/Qt4/Pipe/QtQueryListPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include "QtQueryPipe.hpp"
    1819
    … …  
    2324
    2425
    25 template<typename T> QtQueryListPipe<T>::QtQueryListPipe(std::vector<T> *_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton) :
     26template<typename T> QtQueryListPipe<T>::QtQueryListPipe(Parameter<std::vector<T> > &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton) :
    2627  content(_content),
    2728  dialog(_dialog),

  • src/UIElements/Qt4/Pipe/QtQueryPipe.hpp

    rb9c69d rf10b0c  
    1919// since MOC doesn't like nested classes
    2020
     21#include "Parameters/Parameter.hpp"
    2122#include <Qt/qwidget.h>
    2223
    … …  
    3334template<typename T> class QtQueryListPipe : public QWidget {
    3435  public:
    35     QtQueryListPipe(std::vector<T> *_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton);
     36    QtQueryListPipe(Parameter<std::vector<T> > &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton);
    3637    virtual ~QtQueryListPipe();
    3738    void AddInteger();
    … …  
    4445    void RemoveRow(int row);
    4546
    46     std::vector<T> *content;
     47    Parameter<std::vector<T> > &content;
    4748    QtDialog *dialog;
    4849    QLineEdit *inputBox;

  • src/UIElements/Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.cpp

    rb9c69d rf10b0c  
    3030class RandomNumberDistribution_Parameters;
    3131
    32 RandomNumberDistribution_ParametersQtQueryPipe::RandomNumberDistribution_ParametersQtQueryPipe(const RandomNumberDistribution_Parameters *_content, QtDialog *_dialog, QTextEdit *_theBox) :
     32RandomNumberDistribution_ParametersQtQueryPipe::RandomNumberDistribution_ParametersQtQueryPipe(Parameter<RandomNumberDistribution_Parameters> &_content, QtDialog *_dialog, QTextEdit *_theBox) :
    3333  content(_content),
    3434  dialog(_dialog),

  • src/UIElements/Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2526  Q_OBJECT
    2627public:
    27   RandomNumberDistribution_ParametersQtQueryPipe(const RandomNumberDistribution_Parameters *_content, QtDialog *_dialog, QTextEdit *_theBox);
     28  RandomNumberDistribution_ParametersQtQueryPipe(Parameter<RandomNumberDistribution_Parameters> &_content, QtDialog *_dialog, QTextEdit *_theBox);
    2829  virtual ~RandomNumberDistribution_ParametersQtQueryPipe();
    2930
    … …  
    3233
    3334private:
    34   const RandomNumberDistribution_Parameters *content;
     35  Parameter<RandomNumberDistribution_Parameters> &content;
    3536  QtDialog *dialog;
    3637  QTextEdit *theBox;

  • src/UIElements/Qt4/Pipe/StringQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2626
    2727
    28 StringQtQueryPipe::StringQtQueryPipe(std::string *_content, QtDialog *_dialog) :
     28StringQtQueryPipe::StringQtQueryPipe(Parameter<std::string> &_content, QtDialog *_dialog) :
    2929  content(_content),
    3030  dialog(_dialog)
    … …  
    3535
    3636void StringQtQueryPipe::update(const QString& newText) {
    37   content->assign(newText.toStdString());
     37  content.set(newText.toStdString());
    3838  dialog->update();
    3939}

  • src/UIElements/Qt4/Pipe/StringQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2425  Q_OBJECT
    2526public:
    26   StringQtQueryPipe(std::string *_content, QtDialog *_dialog);
     27  StringQtQueryPipe(Parameter<std::string> &_content, QtDialog *_dialog);
    2728  virtual ~StringQtQueryPipe();
    2829
    … …  
    3132
    3233private:
    33   std::string *content;
     34  Parameter<std::string> &content;
    3435  QtDialog *dialog;
    3536

  • src/UIElements/Qt4/Pipe/UnsignedIntQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2424
    2525
    26 UnsignedIntQtQueryPipe::UnsignedIntQtQueryPipe(unsigned int *_content, QtDialog *_dialog) :
     26UnsignedIntQtQueryPipe::UnsignedIntQtQueryPipe(Parameter<unsigned int> &_content, QtDialog *_dialog) :
    2727  content(_content),
    2828  dialog(_dialog)
    … …  
    3333
    3434void UnsignedIntQtQueryPipe::update(unsigned int newUnsignedInt) {
    35   (*content) = newUnsignedInt;
     35  content.set(newUnsignedInt);
    3636  dialog->update();
    3737}

  • src/UIElements/Qt4/Pipe/UnsignedIntQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2223  Q_OBJECT
    2324public:
    24   UnsignedIntQtQueryPipe(unsigned int *_content, QtDialog *_dialog);
     25  UnsignedIntQtQueryPipe(Parameter<unsigned int> &_content, QtDialog *_dialog);
    2526  virtual ~UnsignedIntQtQueryPipe();
    2627
    … …  
    2930
    3031private:
    31   unsigned int *content;
     32  Parameter<unsigned int> &content;
    3233  QtDialog *dialog;
    3334

  • src/UIElements/Qt4/Pipe/VectorQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2626
    2727
    28 VectorQtQueryPipe::VectorQtQueryPipe(Vector *_content, QtDialog *_dialog, QComboBox *_theBox) :
     28VectorQtQueryPipe::VectorQtQueryPipe(Parameter<Vector> &_content, QtDialog *_dialog, QComboBox *_theBox) :
    2929  content(_content),
    3030  dialog(_dialog),
    … …  
    3636
    3737void VectorQtQueryPipe::updateX(double newDouble) {
    38   (*content)[0] = newDouble;
     38  Vector v = content.get();
     39  v[0] = newDouble;
     40  content.set(v);
    3941  dialog->update();
    4042}
    4143
    4244void VectorQtQueryPipe::updateY(double newDouble) {
    43   (*content)[1] = newDouble;
     45  Vector v = content.get();
     46  v[1] = newDouble;
     47  content.set(v);
    4448  dialog->update();
    4549}
    4650
    4751void VectorQtQueryPipe::updateZ(double newDouble) {
    48   (*content)[2] = newDouble;
     52  Vector v = content.get();
     53  v[2] = newDouble;
     54  content.set(v);
    4955  dialog->update();
    5056}

  • src/UIElements/Qt4/Pipe/VectorQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2526  Q_OBJECT
    2627public:
    27   VectorQtQueryPipe(Vector *_content, QtDialog *_dialog, QComboBox *_theBox);
     28  VectorQtQueryPipe(Parameter<Vector> &_content, QtDialog *_dialog, QComboBox *_theBox);
    2829  virtual ~VectorQtQueryPipe();
    2930
    … …  
    3435
    3536private:
    36   Vector *content;
     37  Parameter<Vector> &content;
    3738  QtDialog *dialog;
    3839  QComboBox *theBox;

  • src/UIElements/Qt4/Pipe/VectorsQtQueryPipe.cpp

    rb9c69d rf10b0c  
    2828
    2929
    30 VectorsQtQueryPipe::VectorsQtQueryPipe(std::vector<Vector> *_content, QtDialog *_dialog, QComboBox *_theBox) :
     30VectorsQtQueryPipe::VectorsQtQueryPipe(Parameter<std::vector<Vector> > &_content, QtDialog *_dialog, QComboBox *_theBox) :
    3131  content(_content),
    3232  dialog(_dialog),

  • src/UIElements/Qt4/Pipe/VectorsQtQueryPipe.hpp

    rb9c69d rf10b0c  
    1515
    1616
     17#include "Parameters/Parameter.hpp"
    1718#include <Qt/qwidget.h>
    1819
    … …  
    2728  Q_OBJECT
    2829public:
    29   VectorsQtQueryPipe(std::vector<Vector>*_content, QtDialog *_dialog, QComboBox *_theBox);
     30  VectorsQtQueryPipe(Parameter<std::vector<Vector> > &_content, QtDialog *_dialog, QComboBox *_theBox);
    3031  virtual ~VectorsQtQueryPipe();
    3132
    … …  
    3435
    3536private:
    36   std::vector<Vector> *content;
     37  Parameter<std::vector<Vector> > &content;
    3738  QtDialog *dialog;
    3839  QComboBox *theBox;
Note: See TracChangeset for help on using the changeset viewer.