Changeset b677ab for src/UIElements/Views/Qt4/Plotting/QSeisPlot.cpp

Timestamp:

Oct 14, 2013, 11:41:38 PM (11 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, 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:

fb9f6d

Parents:

f0964c

git-author:

Frederik Heber <heber@…> (09/04/13 21:20:34)

git-committer:

Frederik Heber <heber@…> (10/14/13 23:41:38)

Message:

Added QSeisPlotPage to QtHomologyList.

• spawning QSeisPlotCurves in QtHomologyList::refill() if homologies are present.
• selected QSeisPlotCurve is plotted.
• xy values are sorted (required by QSeisData).

File:

• src/UIElements/Views/Qt4/Plotting/QSeisPlot.cpp (modified) (2 diffs)

src/UIElements/Views/Qt4/Plotting/QSeisPlot.cpp

@@ -29 +29 @@
     //insertLegend(new QwtLegend(), QwtPlot::RightLegend);
 
-    plottype* tmp = QSeisXMLParser::getInstance().return_plottype_by_name(type.toStdString());
-    ASSERT(tmp != NULL,
+    {
+      const std::string name("energy");
+      const std::string xlabel("Distance");
+      const std::string ylabel("Energy");
+      const std::string style("");
+      const std::vector<int> xunits;
+      const std::vector<int> yunits;
+      const std::vector<std::string> unitnames;
+      const std::map<std::string,std::string> unitmap;
+      m_plottype = new plottype(name,xlabel,ylabel,style,xunits,yunits, unitnames,unitmap);
+    }
+//    plottype* tmp = QSeisXMLParser::getInstance().return_plottype_by_name(type.toStdString());
+    ASSERT(m_plottype != NULL,
         "QSeisPlot::QSeisPlot() - could not find desired plottype by name "+type.toStdString()+".");
-    std::cout << "Type is " << type.toStdString() << ", " << tmp << std::endl;
+    std::cout << "Type is " << type.toStdString() << ", " << m_plottype << std::endl;
 
     //label axes
-    const std::string xlabel = tmp->get_label(plottype::X);
-    const std::string ylabel = tmp->get_label(plottype::Y);
-    const std::string xunits = tmp->get_units(plottype::X);
-    const std::string yunits = tmp->get_units(plottype::Y);
+    const std::string xlabel = m_plottype->get_label(plottype::X);
+    const std::string ylabel = m_plottype->get_label(plottype::Y);
+    const std::string xunits = m_plottype->get_units(plottype::X);
+    const std::string yunits = m_plottype->get_units(plottype::Y);
     setAxisTitle(xBottom, (xlabel+std::string(" [")+xunits+std::string("]")).c_str());
     setAxisTitle(yLeft, (ylabel+std::string(" [")+yunits+std::string("]")).c_str());
@@ -88 +99 @@
 QSeisPlot::~QSeisPlot()
 {
-
+  delete m_plottype;
 }