Ignore:
Timestamp:
Jul 18, 2012, 2:02:13 PM (13 years ago)
Author:
Michael Ankele <ankele@…>
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, 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:
b3a54d
Parents:
30cd0d
git-author:
Michael Ankele <ankele@…> (07/04/12 13:49:18)
git-committer:
Michael Ankele <ankele@…> (07/18/12 14:02:13)
Message:

VectorQuery: removed obsolete _check parameter

Location:
src/UIElements/Qt4/Pipe
Files:
34 edited

Legend:

Unmodified
Added
Removed

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

    r30cd0d r9d5531  
    2828
    2929
    30 AtomQtQueryPipe::AtomQtQueryPipe(Parameter<const atom *> &_content, QtDialog *_dialog, QComboBox *_theBox) :
     30AtomQtQueryPipe::AtomQtQueryPipe(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.set(World::getInstance().getAtom(AtomById(idx)));
     42  content = World::getInstance().getAtom(AtomById(idx));
    4343  dialog->update();
    4444}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2625  Q_OBJECT
    2726public:
    28   AtomQtQueryPipe(Parameter<const atom *> &_content, QtDialog *_dialog, QComboBox *_theBox);
     27  AtomQtQueryPipe(const atom *&_content, QtDialog *_dialog, QComboBox *_theBox);
    2928  virtual ~AtomQtQueryPipe();
    3029
    … …  
    3332
    3433private:
    35   Parameter<const atom *> &content;
     34  const atom *&content;
    3635  QtDialog *dialog;
    3736  QComboBox *theBox;

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

    r30cd0d r9d5531  
    3030
    3131
    32 AtomsQtQueryPipe::AtomsQtQueryPipe(Parameter<std::vector<const atom *> > &_content, QtDialog *_dialog, QListWidget *_theList) :
     32AtomsQtQueryPipe::AtomsQtQueryPipe(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   std::vector<const atom *> temp_atoms;
     43  content.clear();
    4444  for (std::set<const atom *>::iterator iter = currentList.begin(); iter != currentList.end(); ++iter)
    45     temp_atoms.push_back(*iter);
    46   content.set(temp_atoms);
     45    content.push_back(*iter);
    4746  dialog->update();
    4847}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    3029  Q_OBJECT
    3130public:
    32   AtomsQtQueryPipe(Parameter<std::vector<const atom *> > &_content, QtDialog *_dialog, QListWidget *_theList);
     31  AtomsQtQueryPipe(std::vector<const atom *> &_content, QtDialog *_dialog, QListWidget *_theList);
    3332  virtual ~AtomsQtQueryPipe();
    3433
    … …  
    3938
    4039private:
    41   Parameter<std::vector<const atom *> > &content;
     40  std::vector<const atom *> &content;
    4241  std::map<int, const atom *> lookup;
    4342  std::set<const atom *> currentList;

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

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

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2423  Q_OBJECT
    2524public:
    26   BooleanQtQueryPipe(Parameter<bool> &_content, QtDialog *_dialog, QCheckBox *_booleanCheckBox);
     25  BooleanQtQueryPipe(bool &_content, QtDialog *_dialog, QCheckBox *_booleanCheckBox);
    2726  virtual ~BooleanQtQueryPipe();
    2827
    … …  
    3130
    3231private:
    33   Parameter<bool> &content;
     32  bool &content;
    3433  QtDialog *dialog;
    3534  QCheckBox *booleanCheckBox;

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

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

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2322  Q_OBJECT
    2423public:
    25   DoubleQtQueryPipe(Parameter<double> &_content, QtDialog *_dialog);
     24  DoubleQtQueryPipe(double &_content, QtDialog *_dialog);
    2625  virtual ~DoubleQtQueryPipe();
    2726
    … …  
    3029
    3130private:
    32   Parameter<double> &content;
     31  double &content;
    3332  QtDialog *dialog;
    3433

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

    r30cd0d r9d5531  
    2929
    3030
    31 ElementQtQueryPipe::ElementQtQueryPipe(Parameter<const element *> &_content, QtDialog *_dialog, QComboBox *_theBox) :
     31ElementQtQueryPipe::ElementQtQueryPipe(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.set(World::getInstance().getPeriode()->FindElement(idx));
     43  content = World::getInstance().getPeriode()->FindElement(idx);
    4444  dialog->update();
    4545}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2625  Q_OBJECT
    2726public:
    28   ElementQtQueryPipe(Parameter<const element *> &_content, QtDialog *_dialog, QComboBox *_theBox);
     27  ElementQtQueryPipe(const element * &_content, QtDialog *_dialog, QComboBox *_theBox);
    2928  virtual ~ElementQtQueryPipe();
    3029
    … …  
    3332
    3433private:
    35   Parameter<const element *> &content;
     34  const element * &content;
    3635  QtDialog *dialog;
    3736  QComboBox *theBox;

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

    r30cd0d r9d5531  
    3131
    3232
    33 ElementsQtQueryPipe::ElementsQtQueryPipe(Parameter<std::vector<const element *> > &_content, QtDialog *_dialog, QComboBox *_theBox) :
     33ElementsQtQueryPipe::ElementsQtQueryPipe(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;
    4746  if(elemental)
    48     temp_elements.push_back(elemental);
    49   content.set(temp_elements);
     47    content.push_back(elemental);
    5048  dialog->update();
    5149}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2928  Q_OBJECT
    3029public:
    31   ElementsQtQueryPipe(Parameter<std::vector<const element *> > &_content, QtDialog *_dialog, QComboBox *_theBox);
     30  ElementsQtQueryPipe(std::vector<const element *> &_content, QtDialog *_dialog, QComboBox *_theBox);
    3231  virtual ~ElementsQtQueryPipe();
    3332
    … …  
    3635
    3736private:
    38   Parameter<std::vector<const element *> > &content;
     37  std::vector<const element *> &content;
    3938  QtDialog *dialog;
    4039  QComboBox *theBox;

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

    r30cd0d r9d5531  
    3131#include "UIElements/Qt4/QtDialog.hpp"
    3232
    33 FileQtQueryPipe::FileQtQueryPipe(Parameter<boost::filesystem::path> &_content, QtDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton) :
     33FileQtQueryPipe::FileQtQueryPipe(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.set(ListOfFilenames.at(0).toStdString());
    52   filenameLineEdit->setText(QString::fromStdString(content.get().string()));
     51  content = ListOfFilenames.at(0).toStdString();
     52  filenameLineEdit->setText(QString::fromStdString(content.string()));
    5353  dialog->update();
    5454}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2827  Q_OBJECT
    2928public:
    30   FileQtQueryPipe(Parameter<boost::filesystem::path> &_content, QtDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton);
     29  FileQtQueryPipe(boost::filesystem::path &_content, QtDialog *_dialog, QLineEdit *_filenameLineEdit, QPushButton *_filedialogButton);
    3130  virtual ~FileQtQueryPipe();
    3231
    … …  
    3635
    3736private:
    38   Parameter<boost::filesystem::path> &content;
     37  boost::filesystem::path &content;
    3938  QtDialog *dialog;
    4039  QLineEdit *filenameLineEdit;

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

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

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2322  Q_OBJECT
    2423public:
    25   IntQtQueryPipe(Parameter<int> &_content, QtDialog *_dialog);
     24  IntQtQueryPipe(int &_content, QtDialog *_dialog);
    2625  virtual ~IntQtQueryPipe();
    2726
    … …  
    3029
    3130private:
    32   Parameter<int> &content;
     31  int &content;
    3332  QtDialog *dialog;
    3433

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

    r30cd0d r9d5531  
    2929
    3030
    31 MoleculeQtQueryPipe::MoleculeQtQueryPipe(Parameter<const molecule *> &_content, QtDialog *_dialog, QComboBox *_theBox) :
     31MoleculeQtQueryPipe::MoleculeQtQueryPipe(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.set(World::getInstance().getMolecule(MoleculeById(idx)));
     43  content = World::getInstance().getMolecule(MoleculeById(idx));
    4444  dialog->update();
    4545}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2625  Q_OBJECT
    2726public:
    28   MoleculeQtQueryPipe(Parameter<const molecule *> &_content, QtDialog *_dialog, QComboBox *_theBox);
     27  MoleculeQtQueryPipe(const molecule * &_content, QtDialog *_dialog, QComboBox *_theBox);
    2928  virtual ~MoleculeQtQueryPipe();
    3029
    … …  
    3332
    3433private:
    35   Parameter<const molecule *> &content;
     34  const molecule * &content;
    3635  QtDialog *dialog;
    3736  QComboBox *theBox;

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

    r30cd0d r9d5531  
    3131
    3232
    33 MoleculesQtQueryPipe::MoleculesQtQueryPipe(Parameter<std::vector<const molecule *> > &_content, QtDialog *_dialog, QComboBox *_theBox) :
     33MoleculesQtQueryPipe::MoleculesQtQueryPipe(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;
    4746  if (mol)
    48     temp_mols.push_back(mol);
    49   content.set(temp_mols);
     47    content.push_back(mol);
    5048  dialog->update();
    5149}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2827  Q_OBJECT
    2928public:
    30   MoleculesQtQueryPipe(Parameter<std::vector<const molecule *> > &_content, QtDialog *_dialog, QComboBox *_theBox);
     29  MoleculesQtQueryPipe(std::vector<const molecule *> &_content, QtDialog *_dialog, QComboBox *_theBox);
    3130  virtual ~MoleculesQtQueryPipe();
    3231
    … …  
    3534
    3635private:
    37   Parameter<std::vector<const molecule *> > &content;
     36  std::vector<const molecule *> &content;
    3837  QtDialog *dialog;
    3938  QComboBox *theBox;

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

    r30cd0d r9d5531  
    3131
    3232
    33 template<typename T> QtQueryListPipe<T>::QtQueryListPipe(Parameter<std::vector<T> > &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton) :
     33template<typename T> QtQueryListPipe<T>::QtQueryListPipe(std::vector<T> &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton) :
    3434  content(_content),
    3535  dialog(_dialog),
    … …  
    7171
    7272template<typename T> void QtQueryListPipe<T>::addValue(T item) {
    73   std::vector<T> temp = content.get();
    74   temp.push_back(item);
    75   content.set(temp);
     73  content.push_back(item);
    7674
    7775  dialog->update();
    … …  
    9290template<typename T> void QtQueryListPipe<T>::removeRow(int row) {
    9391  int counter = 0;
    94   std::vector<T> temp = content.get();
    95   typename std::vector<T>::iterator iter = temp.begin();
    96   for (; iter != temp.end(); ++iter)
     92  typename std::vector<T>::iterator iter = content.begin();
     93  for (; iter != content.end(); ++iter)
    9794    if (counter++ == row)
    9895      break;
    99   if (iter != temp.end())
    100     temp.erase(iter);
    101   content.set(temp);
     96  if (iter != content.end())
     97    content.erase(iter);
    10298}
    10399
    … …  
    106102  Q_OBJECT
    107103public:
    108   StringsQtQueryPipe(Parameter<std::vector<std::string> > &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton) :
     104  StringsQtQueryPipe(std::vector<std::string> &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton) :
    109105    QtQueryListPipe<std::string>(_content, _dialog, _inputBox, _inputList, _AddButton, _RemoveButton) { }
    110106

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

    r30cd0d r9d5531  
    1919// since MOC doesn't like nested classes
    2020
    21 #include "Parameters/Parameter.hpp"
    2221#include <Qt/qwidget.h>
    2322
    … …  
    3231template<typename T> class QtQueryListPipe : public QWidget {
    3332  public:
    34     QtQueryListPipe(Parameter<std::vector<T> > &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton);
     33    QtQueryListPipe(std::vector<T> &_content, QtDialog *_dialog, QLineEdit *_inputBox, QListWidget *_inputList, QPushButton *_AddButton, QPushButton *_RemoveButton);
    3534    virtual ~QtQueryListPipe();
    3635
    … …  
    4544    void removeRow(int row);
    4645
    47     Parameter<std::vector<T> > &content;
     46    std::vector<T> &content;
    4847    QtDialog *dialog;
    4948    QLineEdit *inputBox;

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

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

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2625  Q_OBJECT
    2726public:
    28   RandomNumberDistribution_ParametersQtQueryPipe(Parameter<RandomNumberDistribution_Parameters> &_content, QtDialog *_dialog, QTextEdit *_theBox);
     27  RandomNumberDistribution_ParametersQtQueryPipe(RandomNumberDistribution_Parameters &_content, QtDialog *_dialog, QTextEdit *_theBox);
    2928  virtual ~RandomNumberDistribution_ParametersQtQueryPipe();
    3029
    … …  
    3332
    3433private:
    35   Parameter<RandomNumberDistribution_Parameters> &content;
     34  RandomNumberDistribution_Parameters &content;
    3635  QtDialog *dialog;
    3736  QTextEdit *theBox;

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

    r30cd0d r9d5531  
    2727#include "LinearAlgebra/RealSpaceMatrix.hpp"
    2828
    29 RealSpaceMatrixQtQueryPipe::RealSpaceMatrixQtQueryPipe(Parameter<RealSpaceMatrix> &_content, QtDialog *_dialog, QTableWidget *_inputTable) :
     29RealSpaceMatrixQtQueryPipe::RealSpaceMatrixQtQueryPipe(RealSpaceMatrix &_content, QtDialog *_dialog, QTableWidget *_inputTable) :
    3030  content(_content),
    3131  dialog(_dialog),
    … …  
    4444{
    4545  tmpM->at(row, column) = inputTable->item(row, column)->text().toDouble();
    46   content.set(*tmpM);
     46  content = *tmpM;
    4747  dialog->update();
    4848}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2726  Q_OBJECT
    2827public:
    29   RealSpaceMatrixQtQueryPipe(Parameter<RealSpaceMatrix> &_content, QtDialog *_dialog, QTableWidget *_inputTable);
     28  RealSpaceMatrixQtQueryPipe(RealSpaceMatrix &_content, QtDialog *_dialog, QTableWidget *_inputTable);
    3029  virtual ~RealSpaceMatrixQtQueryPipe();
    3130
    … …  
    3433
    3534private:
    36   Parameter<RealSpaceMatrix> &content;
     35  RealSpaceMatrix &content;
    3736  QtDialog *dialog;
    3837  QTableWidget *inputTable;

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

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

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2524  Q_OBJECT
    2625public:
    27   StringQtQueryPipe(Parameter<std::string> &_content, QtDialog *_dialog);
     26  StringQtQueryPipe(std::string &_content, QtDialog *_dialog);
    2827  virtual ~StringQtQueryPipe();
    2928
    … …  
    3231
    3332private:
    34   Parameter<std::string> &content;
     33  std::string &content;
    3534  QtDialog *dialog;
    3635

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

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

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2322  Q_OBJECT
    2423public:
    25   UnsignedIntQtQueryPipe(Parameter<unsigned int> &_content, QtDialog *_dialog);
     24  UnsignedIntQtQueryPipe(unsigned int &_content, QtDialog *_dialog);
    2625  virtual ~UnsignedIntQtQueryPipe();
    2726
    … …  
    3029
    3130private:
    32   Parameter<unsigned int> &content;
     31  unsigned int &content;
    3332  QtDialog *dialog;
    3433

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

    r30cd0d r9d5531  
    2626
    2727
    28 VectorQtQueryPipe::VectorQtQueryPipe(Parameter<Vector> &_content, QtDialog *_dialog, QComboBox *_theBox) :
     28VectorQtQueryPipe::VectorQtQueryPipe(Vector &_content, QtDialog *_dialog, QComboBox *_theBox) :
    2929  content(_content),
    3030  dialog(_dialog),
    … …  
    3636
    3737void VectorQtQueryPipe::updateX(double newDouble) {
    38   Vector v = content.get();
    39   v[0] = newDouble;
    40   content.set(v);
     38  content[0] = newDouble;
    4139  dialog->update();
    4240}
    4341
    4442void VectorQtQueryPipe::updateY(double newDouble) {
    45   Vector v = content.get();
    46   v[1] = newDouble;
    47   content.set(v);
     43  content[1] = newDouble;
    4844  dialog->update();
    4945}
    5046
    5147void VectorQtQueryPipe::updateZ(double newDouble) {
    52   Vector v = content.get();
    53   v[2] = newDouble;
    54   content.set(v);
     48  content[2] = newDouble;
    5549  dialog->update();
    5650}

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2625  Q_OBJECT
    2726public:
    28   VectorQtQueryPipe(Parameter<Vector> &_content, QtDialog *_dialog, QComboBox *_theBox);
     27  VectorQtQueryPipe(Vector &_content, QtDialog *_dialog, QComboBox *_theBox);
    2928  virtual ~VectorQtQueryPipe();
    3029
    … …  
    3534
    3635private:
    37   Parameter<Vector> &content;
     36  Vector &content;
    3837  QtDialog *dialog;
    3938  QComboBox *theBox;

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

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

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

    r30cd0d r9d5531  
    1515
    1616
    17 #include "Parameters/Parameter.hpp"
    1817#include <Qt/qwidget.h>
    1918
    … …  
    2827  Q_OBJECT
    2928public:
    30   VectorsQtQueryPipe(Parameter<std::vector<Vector> > &_content, QtDialog *_dialog, QComboBox *_theBox);
     29  VectorsQtQueryPipe(std::vector<Vector> &_content, QtDialog *_dialog, QComboBox *_theBox);
    3130  virtual ~VectorsQtQueryPipe();
    3231
    … …  
    3534
    3635private:
    37   Parameter<std::vector<Vector> > &content;
     36  std::vector<Vector> &content;
    3837  QtDialog *dialog;
    3938  QComboBox *theBox;
Note: See TracChangeset for help on using the changeset viewer.