Changeset 1255 for cpp/frams

Timestamp:

06/22/23 03:31:05 (17 months ago)

Author:

Maciej Komosinski

Message:

structview (Canvas and GL) not resetting view when switching between genotype development checkpoints

Location:

cpp/frams/userinput

Files:

• modelcheckpoints.cpp (modified) (2 diffs)
• modelcheckpoints.h (modified) (1 diff)

cpp/frams/userinput/modelcheckpoints.cpp

@@ -83 +83 @@
                 if (current_index < mod_checkpoints->getCheckpointCount())
                 {
-                        model_view.showModel(mod_checkpoints->getCheckpoint(i));
+                        model_view.showModel(mod_checkpoints->getCheckpoint(i),false);
                         enableSelection(false);
                 }
                 else
                 {
-                        model_view.showModel(mod);
+                        model_view.showModel(mod, false);
                         enableSelection(true);
                 }
@@ -94 +94 @@
 }
 
-int ModelCheckpointSupport::showModel(const Model *m)
+int ModelCheckpointSupport::showModel(const Model *m, bool reset_view)
 {
         freeModel();
-        return model_view.showModel(m);
+        return model_view.showModel(m, reset_view);
 }
 

cpp/frams/userinput/modelcheckpoints.h

@@ -43 +43 @@
         SString checkpointHint();
 
-        int showGeno(const Geno*, bool use_checkpoints);
-        int showModel(const Model *m);
-        Model *getModel();
-        ModelSelection& getModelSelection();
+        int showGeno(const Geno*, bool use_checkpoints) override;
+        int showModel(const Model *m, bool reset_view=true) override;
+        Model *getModel() override;
+        ModelSelection& getModelSelection() override;
         CheckpointsMode getCheckpointsMode();
 };